Commit Graph

32310 Commits

Author SHA1 Message Date
Verkister
e49589ec90 Removes melee damage from snacks.
Not gonna ask why it was there but someone nearly lit the place on fire after jokingly mashing their sandwich at a borg downstream lmao.
2019-05-02 18:55:04 +03:00
Unknown
7cc993f28d Makes this work properly 2019-05-02 03:46:45 -04:00
Unknown
306eef84ca Fixes Part one 2019-05-01 21:33:58 -04:00
Heroman
1a2c7b6ada Fixes emergency pods not working 2019-05-02 10:50:44 +10:00
Atermonera
83ec9db772 Merge pull request #6142 from Novacat/nova-holowarrant
Adds Holowarrant Projectors
2019-05-01 10:37:18 -08:00
Atermonera
b231fbc6de Merge pull request #6133 from Heroman3003/cart-tweek
Minor PDA cartridge tweaks
2019-05-01 10:07:25 -08:00
Mechoid
03852f1a27 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into MultiTile
# Fix Conflicts:
#	polaris.dme
2019-05-01 01:17:02 -07:00
Unknown
e6dcc374af Ports SEV Torch Accessories
...I liked the fancy medals and ribbons...
2019-05-01 03:29:44 -04:00
Heroman3003
839aa5d6b1 Adds some premade full condiment bottles 2019-04-30 10:34:42 +10:00
Neerti
2c20c129fc Merge pull request #6136 from Novacat/nova-alerts
Shortwave and Relay Tweaks
2019-04-29 00:01:07 -04:00
Unknown
567e710fad Adds Holowarrant Projectors
They were supposed to be in the modular computer PR, but, through an oversight, they were not fully implemented.
2019-04-28 23:18:47 -04:00
Neerti
2baef09f0f Merge pull request #6031 from Novacat/spriteadd
[REVIEW] Ports Modular Computers from Baystation
2019-04-28 22:06:27 -04:00
Neerti
df63e48c5e Merge pull request #6139 from Mechoid/FixACTDStuff
Fixes Access Code Transmission Device oversight.
2019-04-28 20:11:08 -04:00
Unknown
3b2cc1ee73 Bay Accessory Hiding Code
Ports Accessory hiding code from bay for rolled down jumpsuits. Currently applies to webbing and armbands.
2019-04-27 23:46:24 -04:00
Anewbe
1e71944633 Merge pull request #6137 from Neerti/it's_time_to_stop
Removes Resident from the Southern Cross
2019-04-27 20:04:03 -05:00
Atermonera
8d3a72a9a9 Merge pull request #6129 from Heroman3003/mask-helmet-eating
Allows liquidfoods to be eaten through protective gear
2019-04-27 15:53:37 -08:00
Unknown
a41e6343b6 Fixes MC Specific bugs 2019-04-27 12:54:38 -04:00
Mechoid
7f037f434a Fixes Access Code Transmission Device oversight. 2019-04-27 00:35:25 -07:00
Unknown
269940f384 Fixes Access Decryption program 2019-04-27 00:12:35 -04:00
Unknown
6eb60af801 Access Decryption, fixes nanoword 2019-04-26 21:25:28 -04:00
Atermonera
a11504f5f2 Merge pull request #6068 from Mechoid/WhatWasWillBe
Re-adds the Space Worm.
2019-04-26 15:32:46 -08:00
Atermonera
e61d850435 Merge pull request #6058 from Neerti/permastuns_are_bad
Removes umbrella permastuns. Adds wind mechanics.
2019-04-26 15:31:56 -08:00
Neerti
1529cfea83 Good bye Resident. 2019-04-26 18:33:57 -04:00
Unknown
682ce60f30 Shortwave and Relay Tweaks
- Shortwaves will now transmit to all connected Z levels
- Relays will now update their connected Z level if moved (useful for relays on shuttles)

Code ported from Baystation.
2019-04-26 18:00:18 -04:00
Neerti
4dbb8aeaaa Merge pull request #6118 from Novacat/nova-alerts
Ports Baystation's SS Debugging
2019-04-25 17:02:46 -04:00
Neerti
e566f4d03f Merge pull request #6131 from Heroman3003/nurse-two
Fixes a typo in nurse spider ai code
2019-04-25 17:01:43 -04:00
Heroman
422b0da409 Fixes cartridges having same design ID 2019-04-26 06:04:33 +10:00
Heroman
98bf80e7b3 Fixes names of some cartridges, order of designs 2019-04-26 05:44:11 +10:00
Heroman
5a5e8d133b Minor PDA cartridge tweaks 2019-04-26 05:39:43 +10:00
Heroman3003
535349dcce Fixes ai priority targeting 2019-04-25 10:21:44 +10:00
Heroman3003
48b852e5e9 Merge branch 'master' into mask-helmet-eating 2019-04-25 07:34:07 +10:00
Anewbe
cd4fb67058 Merge pull request #6126 from Heroman3003/phoronguard
Fixes some items having item_flag PHORONGUARD
2019-04-24 16:12:03 -05:00
Atermonera
3f3f449543 Merge pull request #6128 from Mechoid/SlimesAreAssholes
Xenobio Slimes Grudge Promethean Attackers
2019-04-24 11:29:30 -08:00
Heroman
708518e1f3 Fixes a typo in nurse spider ai code 2019-04-24 15:53:05 +10:00
Unknown
539f4f133a Removes Space Magazine
Only commented out, so that it can be used as an example for future lore projects.
2019-04-23 14:01:22 -04:00
Unknown
76625319de Merge remote-tracking branch 'PolarisSS13/master' into spriteadd 2019-04-23 13:28:07 -04:00
Mechoid
c35eedefe7 Wormholes. 2019-04-22 23:33:54 -07:00
Heroman3003
18ec889481 Fixes gamemode checking list itself, not entries 2019-04-23 13:02:40 +10:00
Unknown
d4c0dd5d69 Merge remote-tracking branch 'PolarisSS13/master' into spriteadd 2019-04-22 20:20:56 -04:00
Atermonera
2deca08d67 Merge pull request #6114 from Neerti/gamemode_config
Makes gamemode player requirements be able to be overridden in the config
2019-04-22 10:33:07 -08:00
Atermonera
a5d5755c16 Merge pull request #6117 from Neerti/ai_shell_manifest_fix
Hides AI Shells from the manifest.
2019-04-22 10:30:46 -08:00
Atermonera
93abdb04ea Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev
Marble ore [Exists] again.
2019-04-22 10:29:20 -08:00
Mechoid
c4665ae0a4 & 2019-04-21 22:24:51 -07:00
Neerti
47e8b110b4 Merge pull request #6115 from Mechoid/SterilizineTheThinkingXenobiologistsWeapon
Sterilizine Hurts Slimes
2019-04-22 01:24:19 -04:00
Neerti
fc3e800407 Merge pull request #6125 from Heroman3003/fire-alarm-deconstruction
Fixes ability to deconstruct fire alarms
2019-04-22 00:28:44 -04:00
Neerti
da4fc235db Merge pull request #6124 from Heroman3003/window-message-fix
Fixes message on window frame fastening
2019-04-22 00:28:27 -04:00
Neerti
d6a74b637e Merge pull request #6116 from Mechoid/WhyAmIStupid
God damnit past me.
2019-04-22 00:26:58 -04:00
Neerti
42bd6eb1c2 Merge pull request #6105 from Heroman3003/climbybois
Fixes borgs being unable to use ladders
2019-04-22 00:26:44 -04:00
Heroman3003
1f24765d1d Allows liquidfoods to be eaten through protective gear 2019-04-22 10:31:07 +10:00
Mechoid
29c5ee05e3 Xenobio slimes now get grudges against Prometheans that attack them, making them valid targets for that slime as long as it lives. 2019-04-21 16:06:17 -07:00