833a700cbb
Fixes invalid throwat args ( #35565 )
2018-02-13 07:14:47 -06:00
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -06:00
30d4b25aee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
2018-01-01 14:09:07 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
d960c45e77
Merge pull request #33622 from duncathan/assert_gas
...
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 00:14:13 -06:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
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
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
1e2ecf3ef7
buffs ripley mining equipment ( #32509 )
...
* buffs ripley mining equipment
done in separate PR in case people want just this change instead of the others
1. increased range on the drill
2. halved the cooldown on the drill
3. doubled the speed of the ore pulse
* Why argue about this for days when I can just update it myself
2017-11-09 00:44:28 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
ae86a75362
Greyscale cables
2017-10-25 21:46:57 -05:00
0090a71bea
adds logging to ripley gibs ( #32032 )
...
* maybe this works, and maybe it doesn't
* cyberfriend
* oh right
2017-10-24 11:25:04 -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
28656d3347
Merge pull request #31809 from ShizCalev/helper-cleanup
...
Cleans up some istypes not using helpers
2017-10-17 19:21:14 -05:00
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
4f32b7a0d4
Moves assert_gas() into a define it should always have been, speeding up atmos slightly
2017-10-07 13:37:28 -05:00
f8f599b17b
Stops putting RCD, bluespace bags, and staves into ORM
2017-09-29 19:33:37 -05:00
6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
ee5c44191d
adds logging to graivpult precision throwing ( #30608 )
...
* Update other_tools.dm
* Update other_tools.dm
* Update other_tools.dm
2017-09-12 17:14:22 -05:00
33f36fd0de
Adds Archaeology Component
2017-09-08 10:02:01 -05:00
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
8dae545d59
Goodbye spawn ( #1387 )
2017-06-04 09:05:47 -07:00
6b4b6ee70d
Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
2017-05-22 22:21:20 -05:00
64f288fda6
Merge pull request #1112 from Citadel-Station-13/upstream-merge-27502
...
[MIRROR] Ripleys will collect all ore in front of them when they move with a clamp and stored ore box
2017-05-22 17:21:09 -05:00
7a57898886
Ripleys will collect all ore in front of them when they move with a clamp and stored ore box
2017-05-22 11:44:54 -05:00
a430e24555
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
2017-05-18 16:38:09 -05:00
8bcaa54cbe
[MIRROR] Fixes language code ignoring holder restrictions ( #858 )
...
* Fixes language code ignoring holder restrictions
* resolve .rej file.
2017-05-18 04:13:57 -05:00
257cf986c5
Repaths C4 ( #808 )
...
* Repaths C4
* Delete tgstation.2.1.3.dmm.rej
* Add files via upload
* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
8a3b280ede
Preliminary tesla projectile refactor (also insults vcordie because I'm mean.)
2017-05-06 10:42:51 -05:00
ShizCalev