Metis
cf1a9a28e7
synthliz gluttony
2024-10-11 01:29:11 -04:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
DeltaFire
855df65ba2
cord cell charge
2021-11-16 22:56:31 +01:00
Timothy Teakettle
14e217082f
compile
2020-10-01 20:51:53 +01:00
Timothy Teakettle
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
silicons
f03343b516
fix
2020-06-30 05:19:50 -07:00
silicons
7a2818d657
fix
2020-06-29 23:45:18 -07:00
silicons
6a91ce8416
fix
2020-06-29 23:43:53 -07:00
silicons
3b3a3ad44e
nayser
2020-06-29 23:37:51 -07:00
Timothy Teakettle
f2aa370506
make ipcs cool
2020-06-04 14:59:52 +01:00
Ghommie
592198d659
Makes privates not spew around upon disembowelment or gibbing.
2020-05-02 20:01:54 +02:00
kevinz000
e4e2c0195c
epic
2020-04-22 12:04:47 -07:00
kevinz000
c551006295
catch dropped
2020-04-22 10:54:42 -07:00
kevinz000
467497af54
woops
2020-04-22 10:45:13 -07:00
kevinz000
3e09ee8328
Alright
2020-04-22 10:42:11 -07:00
Ghommie
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
TrilbySpaceClone
c638a83e23
Merge branch 'master' into more_implants
2020-02-22 18:34:02 -05:00
Trilbyspaceclone
18bfde5a0a
Update augments_arms.dm
2020-02-22 17:58:50 -05:00
Trilbyspaceclone
71cb8e19cb
Update augments_arms.dm
2020-02-14 09:15:47 -05:00
Trilbyspaceclone
c38049fbef
Update augments_arms.dm
2020-02-14 09:12:48 -05:00
Trilbyspaceclone
d6acae3254
ghommie changes
2020-02-13 14:16:55 -05:00
TrilbySpaceClone
75844930b4
new implants!
2020-02-13 03:42:59 -05:00
Ghommie
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
Ghommie
8de11845d5
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
Ghommie
676186ee36
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
2019-07-16 23:15:52 +02:00
Ghommie
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
Ghommie
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
Ghommie
ffecca8c11
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-03 03:24:28 +02:00
Ghom
d4a13077ff
ports in "Adds radial menu to arm-mounted implants" ( #8733 )
2019-06-23 06:01:09 -07:00
Ghommie
0513f3464a
one
2019-06-05 19:20:25 +02:00
Poojawa
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
deathride58
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
deathride58
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
kevinz000
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
CitadelStationBot
3d26cd4a6f
[MIRROR] Replaced body zone magic strings with defines ( #6004 )
...
* Replaced body zone magic strings with defines
* merge conflicts
2018-03-19 21:18:57 -05:00
CitadelStationBot
26702fda91
[MIRROR] Makes new surgeries check for tool qualities ( #5690 )
...
* Makes new surgeries check for tool qualities (#35847 )
* Makes new surgeries check for tool qualities
* Gives augments and autosurgeon some tool_act love
* okay
* Fix duplicate definition
* Makes new surgeries check for tool qualities
2018-02-24 07:02:26 -06:00
deathride58
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
Leo
0985450524
Merge pull request #34270 from tgstation/Cyberboss-patch-3
...
Fixes toolarm grammar
2018-01-11 17:12:47 -06:00
Jordan Brown
82114e753d
Merge pull request #33704 from Fox-McCloud/arm-implant-fix
...
Fixes Arm Implant EMP Effect
2017-12-21 00:43:22 -06:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
e827f02863
[MIRROR] Fixes various spelling and grammar errors. ( #3436 )
...
* Fixes various spelling and grammar errors.
* Update crashedship.dm
* Update listeningstation.dm
* Update augments_chest.dm
* Update augments_chest.dm
2017-10-21 07:10:23 -05:00
Jordan Brown
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00