Commit Graph

15882 Commits

Author SHA1 Message Date
Ghommie
85ba7943db Less visual issues. 2019-10-29 04:58:24 +01:00
Ghommie
9d17e63314 sofa sprites armrest improvements. 2019-10-29 04:53:24 +01:00
kevinz000
fae47c58ed Merge pull request #9635 from Thalpy/JacqFixes
[Expedite] [Halloween] A few fixes for Jacqueline and Barth.
2019-10-27 16:41:06 -07:00
kevinz000
da387bfdf4 Merge pull request #9620 from YakumoChen/proto_beanbag
Adds Beanbag Slugs to Seclathe
2019-10-27 16:13:31 -07:00
kevinz000
e583412388 Merge pull request #9480 from Poojawa/access-clarifications
Clarifies ID Console descriptions
2019-10-27 16:13:16 -07:00
kevinz000
48105c5a5f Merge pull request #9630 from Ghommie/Ghommie-cit280
little camera console fix.
2019-10-27 16:11:58 -07:00
kevinz000
dfd06225d3 Merge pull request #9617 from JTGSZ/ghomfix
Barricade girder walls no longer runtime each tick.
2019-10-27 16:11:35 -07:00
kevinz000
880b4039e7 Merge pull request #9622 from Ghommie/Ghommie-cit275
Tweaking the Cyber Sylph's barsign.
2019-10-27 16:10:08 -07:00
kevinz000
19729ee706 Merge pull request #9623 from Ghommie/Ghommie-cit276
Ports "New Teleporter Station sprites." and "Add teleport station calibration animation."
2019-10-27 16:09:20 -07:00
kevinz000
309cf531aa Merge pull request #9627 from Ghommie/Ghommie-cit279
Unmodularize MkII hyposprays and other reagent items sprites.
2019-10-27 16:09:04 -07:00
kevinz000
d67b7f620d Merge pull request #9613 from Linzolle/hat-toss
Port hat tossing
2019-10-27 16:08:00 -07:00
Thalpy
0fabd72087 Barth you fusspot 2019-10-27 22:40:45 +00:00
Thalpy
6de94a23c0 Oops 2019-10-27 22:32:47 +00:00
Thalpy
c30f550274 Well here it is 2019-10-27 22:29:35 +00:00
Linzolle
bdd553d4f7 thanks ghom 2019-10-27 17:26:55 -05:00
Thalpy
a76ff4efe6 Alright 2019-10-27 19:24:23 +00:00
Thalpy
739de1b378 Fixes 2019-10-27 19:07:06 +00:00
kevinz000
dabfba8a0d Merge pull request #9619 from BlackMajor/Yote
Buffs engiborg build potential
2019-10-27 05:38:50 -07:00
Ghommie
9608b437b4 I need to fix the camera bug later... thing has been borked for one year. 2019-10-27 12:18:49 +01:00
Ghommie
29777f25e5 stop cyborg from interacting with objects out of their FoV, lil camera console fix 2019-10-27 11:55:11 +01:00
BlackMajor
a7ecaaf977 Ok but what if light replacer 2019-10-27 15:58:51 +13:00
Ghommie
bf92aa2ffb Unmodularize MkII hyposprays and other reagent items sprites. 2019-10-26 19:14:28 +02:00
Ghommie
5bccde6e70 Ports "New Teleporter Station sprites." and "Add teleport station calibration animation." 2019-10-26 15:25:26 +02:00
Ghommie
3b3a4f9af1 Updating a comment. 2019-10-26 15:06:02 +02:00
BlackMajor
1b2d1c1423 Whoops again 2019-10-27 02:04:46 +13:00
YakumoChen
325de79b3a adds beanbag slug to starter node 2019-10-26 10:22:50 +00:00
YakumoChen
0845c6915e adds beanbag to sec lathe 2019-10-26 10:19:01 +00:00
BlackMajor
90d28b7202 whoops 2019-10-26 23:00:12 +13:00
BlackMajor
f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13:00
Poojawa
4820efd047 Merge branch 'master' into access-clarifications 2019-10-25 22:24:56 -05:00
deathride58
8f479492db Merge pull request #9513 from Citadel-Station-13/kevinz000-patch-98
medibots are now TOXINLOVER (so slimes) friendly
2019-10-25 23:17:30 -04:00
nik707
b324b8bd51 Merge pull request #9408 from Citadel-Station-13/kevinz000-patch-89
adminhelp tickets now show the names of admins who use resolve actions on them
2019-10-25 22:16:27 -05:00
deathride58
53fe02e2fc Merge pull request #9539 from Citadel-Station-13/kevinz000-patch-100
TALLY HO! (adds claymores to the uplink)
2019-10-25 23:16:09 -04:00
nik707
187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
2019-10-25 22:16:02 -05:00
kevinz000
daf4acbceb Merge pull request #9599 from Ghommie/Ghommie-cit264
Ports "New Revenant icons"
2019-10-25 20:13:05 -07:00
kevinz000
49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267
Unmodularize lavaknights and emags.
2019-10-25 20:12:35 -07:00
kevinz000
08d139ee2c Merge pull request #9608 from Ghommie/Ghommie-cit272
Unmodularize Eutactic Blades.
2019-10-25 20:11:01 -07:00
kevinz000
275ecbf468 Merge pull request #9604 from Ghommie/Ghommie-cit268
Unmodularize job types
2019-10-25 20:10:39 -07:00
kevinz000
4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269
Unmodularize vox sounds
2019-10-25 20:09:52 -07:00
kevinz000
8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270
Unmodularize research.
2019-10-25 20:09:26 -07:00
kevinz000
9b7b2ce0b2 Merge pull request #9607 from Ghommie/Ghommie-cit271
Unmodularize events
2019-10-25 20:07:48 -07:00
JTGSZ
f97e244cc9 Update deployable.dm 2019-10-25 21:23:52 -04:00
Linzolle
5bafab9447 missing period 2019-10-25 16:34:32 -05:00
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355)
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
2019-10-25 16:19:19 -05:00
Ghommie
c1f84da39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 12:26:17 +02:00
BlackMajor
1705765555 Update hilbertshotel.dm 2019-10-25 23:02:09 +13:00
kevinz000
4af2233c5f Merge pull request #9549 from Ghommie/Ghommie-cit252
Fixes identity transfer not copying digi legs.
2019-10-24 19:15:33 -07:00
kevinz000
bd9443252a Merge pull request #9579 from YakumoChen/shapeshift
Ports #41638 and #43784, "Wizard Shapeshift now converts damage taken while transformed"
2019-10-24 19:13:54 -07:00
kevinz000
7beb00abba Merge pull request #9593 from Ghommie/Ghommie-cit263
Fixing gulag teleporter stripping the user of stuff it really shouldn't.
2019-10-24 19:10:17 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00