deathride58
e4410a3320
Merge branch 'master' into mapsyncs43293845982
2018-01-08 06:18:11 +00:00
Tlaltecuhtli
7aa8bf9b69
fixes some grinder recipes ( #34093 )
...
* commit
help what is this
* ddd
* sdsadsda
* fegdhfd
* ddddddddddddddd
2018-01-07 20:36:29 -06:00
deathride58
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
modularized_suicide
c2851e7837
priority:critical
2018-01-07 02:08:51 -06:00
deathride58
ebf3863195
Merge pull request #4681 from Citadel-Station-13/upstream-merge-34034
...
[MIRROR] Makes crayons draw at the location you click
2018-01-05 22:16:53 +00:00
Jordan Brown
505fc95ad0
Merge pull request #34034 from deathride58/goonstylecrayons
...
Makes crayons draw at the location you click
2018-01-05 09:28:07 -06:00
Cruix
406ccb256f
Fixed PDAs not calling parent in equipped() ( #34081 )
2018-01-05 05:59:54 -06:00
deathride58
e6ec24d13c
Merge branch 'master' into mapsyncs43293845982
2018-01-05 02:03:51 +00:00
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
oranges
a227ddf3c1
Merge pull request #34025 from DaxDupont/PDAColor
...
PDA Interface color is now a preference.
2018-01-03 21:12:09 -06:00
LetterJay
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
LetterJay
168519c328
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311
2018-01-01 07:00:34 -06:00
Jordan Brown
54032f9c6d
Merge pull request #33960 from ShizCalev/flamer
...
Corrects flamethrower capitalization
2017-12-31 10:02:59 -06:00
LetterJay
b260704381
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
...
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
LetterJay
19c6db6a6e
Merge pull request #4591 from Citadel-Station-13/upstream-merge-33905
...
[MIRROR] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-30 05:06:03 -06:00
LetterJay
4599680f68
Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
...
[MIRROR] Internal radio implant
2017-12-30 05:03:48 -06:00
LetterJay
2d9a70a487
Update uplink_kits.dm
2017-12-29 18:42:44 -06:00
LetterJay
a3ebaa5de8
Merge branch 'master' into upstream-merge-32311
2017-12-29 18:38:50 -06:00
Tad Hardesty
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
Jordan Brown
d38a4a2aa5
Merge pull request #33905 from ShizCalev/jumpsuit-fix
...
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
coiax
866318e33e
Internal radio implant
2017-12-29 02:52:24 -06:00
oranges
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
LetterJay
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
LetterJay
67ef791794
Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821
...
[MIRROR] Fixes deleting handcuffs
2017-12-27 03:05:33 -06:00
LetterJay
d33fe81662
Merge pull request #4536 from Citadel-Station-13/upstream-merge-33822
...
[MIRROR] Cut through handcuffs with power wirecutters
2017-12-27 03:05:21 -06:00
Matt Smith
7b159e204c
Cut through handcuffs with power wirecutters ( #33822 )
...
* Cut through handcuffs with power wirecutters
* unbuckle is handled on delete of the handcuffs
2017-12-26 00:14:24 -06:00
ShizCalev
3ea4e84719
Fixes deleting handcuffs ( #33821 )
...
* Fixes deleting handcuffs
* cleanup
2017-12-26 00:13:13 -06:00
LetterJay
5dd7136225
Merge branch 'master' into upstream-merge-33590
2017-12-25 21:29:18 -06:00
Emmett Gaines
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
LetterJay
709d55bc4a
Update pneumaticCannon.dm
2017-12-23 13:50:48 -06:00
Dax Dupont
e0118067ec
2 borg metal fixes for the price of one ( #33738 )
2017-12-22 18:51:35 -06:00
CitadelStationBot
938f409782
[MIRROR] Christmas ( #4491 )
...
* Christmas (#33690 )
* Christmas Event Updates
* Dont recreate the list every time
* Check for drop del
* Changes some things to placate that one guy from FTL
* Christmas
2017-12-22 13:14:25 -08:00
kevinz000
bec20087c2
[READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-22 10:58:13 -06:00
LetterJay
3156382d2e
Merge pull request #4470 from Citadel-Station-13/upstream-merge-33700
...
[MIRROR] Fixes some syndicate duffelbags missing inhands
2017-12-21 04:58:46 -06:00
LetterJay
86fed404b1
Update weldingtool.dm
2017-12-21 04:36:01 -06:00
LetterJay
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
deathride58
4d08f9b0bc
Merge pull request #4445 from Citadel-Station-13/upstream-merge-33635
...
[MIRROR] Fixes captain's PDA showing the toggle remote door menu option
2017-12-21 03:47:50 +00:00
deathride58
b2187123fb
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
...
[MIRROR] [Ready]Brain Trauma additions
2017-12-21 03:42:38 +00:00
deathride58
17dda62a93
Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622
...
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-21 03:28:14 +00:00
deathride58
58f5069180
Merge pull request #4463 from Citadel-Station-13/upstream-merge-33664
...
[MIRROR] Halve gun empty sound level
2017-12-21 03:27:50 +00:00
deathride58
2de3b12364
Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594
...
[MIRROR] Adds knock off component
2017-12-21 03:25:41 +00:00
QualityVan
5869eae8e9
Fixes some syndicate duffelbags missing inhands
2017-12-20 19:54:56 -06:00
Jordan Brown
25d5e5b6b4
Merge pull request #33594 from AnturK/knockoff
...
Adds knock off component
2017-12-20 00:14:36 -06:00
Jordan Brown
b305f1bb26
Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears
...
Halve gun empty sound level
2017-12-20 00:14:28 -06:00
oranges
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
LetterJay
74bba8aea7
Update cards_ids.dm
2017-12-19 19:31:44 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
d59e85e214
Update weldingtool.dm
2017-12-19 15:20:39 -06:00
