a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
1a918ed8db
animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game
2022-05-31 19:22:30 -04:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
8cb16aa0f3
Fixes item transfers
2021-10-14 17:26:17 -04:00
13140f9bb9
Somewhat fixed huds and stuff, not 100%
2021-10-14 16:36:18 -04:00
6331ced3e5
The rest of the offering stuff
2021-10-13 22:13:33 -04:00
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
0bae06adcd
Original Port
2021-10-11 22:00:54 -04:00
4b2bffdff0
Actually makes it work by /obj/screen --> /atom/movable/screen
2021-07-29 14:06:18 +03:00
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
745c825205
Give hotkey, but citadel
2021-01-20 04:21:57 +02:00
d2500fe389
Adds Methane and Methyl Bromide
2020-09-27 15:15:58 -05:00
1c9a22fa5e
Readds the old temperature notification method in the form of a shivering/sweating notification
2020-09-03 01:35:28 -04:00
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
78312c23bf
sigh
2020-07-28 21:53:07 -07:00
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
fafde35ee2
Fixes the Arks looping issue, and gives Ratvar new words when fighting
...
Also removes the grace period variable since the ark activates immediately now /shrug
2020-07-23 12:59:40 -04:00
ae83a6df02
fix
2020-07-19 19:51:17 -07:00
0b98b0409b
sigh
2020-07-18 18:29:09 -07:00
de8ac9896a
sigh
2020-07-11 07:13:56 -07:00
cc2e9530b1
fix
2020-07-11 00:44:17 -07:00
8d5d194a26
hahahahaha
2020-07-11 00:30:56 -07:00
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
d88c815845
vars ( #12373 )
2020-05-28 01:18:26 +02:00
18471be4ce
cult team
2020-03-10 20:11:18 -07:00
9fd9f60855
compile
2020-01-11 10:49:44 -08:00
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
9250b1c103
big uppdate season
2019-10-23 21:08:47 -05:00
9f8ad74bf9
New traumas and some other things.
2019-10-08 03:53:01 -04:00
07cb9572bd
Onclick
2018-09-11 01:33:01 -05:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
63013f8964
everything to controllers
2018-07-02 00:10:31 -04:00
e9d3af6e61
The ARM is now harder to obtain ( #36051 )
...
* Added ARM difficulty
* Working edition Pt1
* Actually working Pt2
* Appropriate null check?
* Update narsie.dm
2018-03-09 02:17:46 -06:00
7b493c30d7
Merge pull request #35664 from AnturK/tooltipruntimes
...
Fixes some tooltip runtimes
2018-02-15 10:38:27 -06:00
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -06:00
80095fea0a
Replaces cached get_area vars for names ( #34338 )
2018-01-13 20:56:11 -06:00
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
ecf49cd0a0
ok now i kinda tested the ark examine ( #32445 )
...
* No, I did NOT test the Ark examine.
* Update countdown.dm
* Update ark_of_the_clockwork_justicar.dm
* Update ark_of_the_clockwork_justicar.dm
* OK JOAN FIXED
* Update ark_of_the_clockwork_justicar.dm
2017-11-09 20:57:39 -06:00
53c9c16fe3
one more thing to allow more mobs to qdel nicely ( #32168 )
2017-10-29 07:14:44 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
0aa2e6b6a2
Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes ( #31609 )
...
* Update alert.dm
* better fix
2017-10-19 02:01:14 -05:00
f621fb704b
Merge branch 'master' into upstream-merge-31069
2017-10-01 02:56:28 -04:00
98d6927eb6
Cleanup to various loc assignments and nearby code
2017-09-30 08:10:52 -05:00
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
SandPoot