cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 23:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,604 Commits 29 Branches 2 Tags
fa1a3ee49ee24b3fa6f9b8fe9ba468a264fa52b3
Commit Graph

24115 Commits

Author SHA1 Message Date
Fox-McCloud
fa1a3ee49e Adds in Stun Gloves 2017-01-16 19:11:03 -05:00
Fox McCloud
b993295e60 Merge pull request #6120 from TullyBurnalot/OverOverload 
Multiple Ascendant Light Fix
 2017-01-15 12:44:47 -05:00
TullyBurnalot
f7b729c138 ACTUALLY addresses suggestion by Krausus 2017-01-15 17:37:30 +00:00
Fox McCloud
011b492e2e Merge pull request #6146 from Crazylemon64/i_love_evil_traps 
Makes Adminbussing Evil Traps Easier
 2017-01-15 12:06:39 -05:00
TullyBurnalot
86536e3b43 Removes needless proc 2017-01-15 14:35:00 +00:00
TullyBurnalot
d2210f24c5 Re-adds skip_sounds_and_sparks 
Woops, forgot how useful this could be
 2017-01-15 14:25:05 +00:00
TullyBurnalot
2d82f940f6 Addresses suggestion by Krausus/Syntax fix 2017-01-15 14:20:15 +00:00
Krausus
c711bb5d83 Removes redundant slime subtype 2017-01-15 00:46:23 -05:00
Krausus
3aa007a1c7 Pet slime tweaks 2017-01-14 17:38:08 -05:00
Fox McCloud
e5559fa35e Merge pull request #6159 from Crazylemon64/allow_bible_reveal 
Bibles can reveal runes now
 2017-01-14 09:29:20 -05:00
Krausus
f12b6be92d Tweaks cult datum initialization 
- Moves cultdat setting from game modes' pre_setup to New
- Removes initialization messages
- Makes the cult datum only get created once
 2017-01-14 00:02:52 -05:00
Crazylemon64
0e01cf9353 Redundancy removal 2017-01-13 15:33:22 -08:00
Crazy Lemon
5d45616cb8 Merge pull request #6160 from Fox-McCloud/gcing 
Fixes Operating Table and Operating Computer GCing
 2017-01-13 14:16:16 -08:00
Fox-McCloud
d722235c15 Fixes Operating Table and Operating Computer GCing 2017-01-13 17:08:11 -05:00
Crazylemon64
d2da018f56 Removes the /atom-level var 2017-01-13 14:05:04 -08:00
Crazylemon64
224f86bd64 Bibles can reveal runes now 2017-01-13 13:42:56 -08:00
Fox McCloud
2aa86d8777 Merge pull request #5704 from uraniummeltdown/lingfixesspecies 
Changeling Changes
 2017-01-13 15:50:17 -05:00
Fox McCloud
b45493442c Merge pull request #6104 from TullyBurnalot/BureaucracyIsTheLifeblood 
Space Law/SOP/Legal SOP Roundstart Messages
 2017-01-13 15:48:56 -05:00
Fox McCloud
5df12c667a Merge pull request #6151 from DarkPyrolord/nojoyallowed 
Removes the joy mask
 2017-01-13 12:39:42 -05:00
TullyBurnalot
a0d1f4333c Removes needless "The"s 2017-01-12 22:17:52 +00:00
TullyBurnalot
632030daa3 Addressing request by Fox 2017-01-12 22:05:13 +00:00
TullyBurnalot
d8d5279d66 Cyborg tools not allowed in display cases 2017-01-12 21:36:19 +00:00
TullyBurnalot
8dd1856121 Graffiti prints are now hidden 2017-01-12 20:24:17 +00:00
TullyBurnalot
cb4674fb78 Graffiti now have fingerprints 2017-01-12 19:54:36 +00:00
Aurorablade
0dde519971 REEEEEEEEEEEEEEEEEEEEEE 2017-01-12 13:06:14 -05:00
Aurorablade
1ed0d48da1 fixes for conflict and a map runtime 2017-01-12 00:06:58 -05:00
Aurorablade
5a07759c97 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie 2017-01-11 23:41:06 -05:00
DarkPyrolord
217244deac Removes the joy mask 2017-01-12 16:19:12 +13:00
Fox McCloud
23ee27796e Merge pull request #6124 from Markolie/mechasimple 
Add cooldown to simple_animal Mecha attacks
 2017-01-11 16:37:00 -05:00
Fox McCloud
b75614c4a2 Merge pull request #6138 from Puckaboo2/masterbackup 
Adding medical scrubs and caps to the loadout
 2017-01-11 16:36:44 -05:00
uraniummeltdown
fa3c392f46 small fix 2017-01-11 18:45:50 +04:00
uraniummeltdown
7374f0a296 moved check up under Click() 2017-01-11 18:22:31 +04:00
Fox McCloud
42545b0583 Merge pull request #6133 from Crazylemon64/fix_custom_open_borgpanels 
Custom borg panels no longer overwrite themselves
 2017-01-11 08:53:31 -05:00
Fox McCloud
6e1b1d282c Merge pull request #6147 from Crazylemon64/karma_reminder_fix 
Fixes karma reminder inversion
 2017-01-11 08:53:22 -05:00
Fox McCloud
dce9edc6e3 Merge pull request #6129 from Crazylemon64/ghost_clearcut_respawnability 
Ghosts now have an indicator on whether they can respawn or not
 2017-01-11 08:52:37 -05:00
Fox McCloud
7618c386fe Merge pull request #6127 from Lady-Luck/laptop 
Makes office laptops traversable
 2017-01-11 08:51:37 -05:00
Fox McCloud
ca71f03f7e Merge pull request #6135 from FlattestGuitar/fluff-comp 
Adds a fluff item for ComputerlessCitizen
 2017-01-11 08:51:11 -05:00
Fox McCloud
68dfbf6217 Merge pull request #6131 from Crazylemon64/robot_module_actions 
Robot module actions
 2017-01-11 08:50:50 -05:00
Fox McCloud
cd82e3d48f Merge pull request #6143 from uraniummeltdown/engiboardsfix 
Atmos Consoles Fix
 2017-01-11 08:48:04 -05:00
Fox McCloud
44401d384d Merge pull request #6144 from Crazylemon64/runtime_killer 
Runtime killer
 2017-01-11 08:47:34 -05:00
Crazylemon64
3699328100 Fixes karma reminder inversion 2017-01-11 02:25:06 -08:00
Crazylemon64
3c50c2f6ba Makes conveyors easier to place with buildmode, adds vars to autogibbers 
makes them kill stuff stupid fast
 2017-01-11 02:07:20 -08:00
Crazylemon64
3e141ebbb7 Mining drones now are able to use meson sight again 
Mining drones now can activate mesons
 2017-01-10 23:37:49 -08:00
uraniummeltdown
c4033a85bd added category for atmos consoles 2017-01-11 09:56:16 +04:00
Aurorablade
f548599014 I need to work on this later its holding up the bug fixes... 2017-01-11 00:32:15 -05:00
uraniummeltdown
a69a576c5c edited absorb + identity objectives, added sting icons 2017-01-11 08:31:44 +04:00
Crazylemon64
bfdd22dcd9 Fixes a few limb removal runtimes 2017-01-10 18:59:33 -08:00
Fox-McCloud
8e355a867c Fixing Food Runtime 2017-01-10 21:40:54 -05:00
Crazylemon64
a852d3f314 Fixes a garrote runtime 2017-01-10 18:28:40 -08:00
Fox McCloud
ef3e433f07 Merge pull request #6125 from Crazylemon64/spiders_non_xeno 
Giant Spiders no longer clog up the Alien role channel
 2017-01-10 17:46:43 -05:00