cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-27 01:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,034 Commits 29 Branches 2 Tags
dbf02506ec0ce2dab2efdc5ebf4f43823b1cd9bb
Commit Graph

12302 Commits

Author SHA1 Message Date
TheDZD
2fbd6edf7d Merge pull request #5432 from Alexshreds/ORM4engies 
ORM 4 Engies 2016
 2016-08-14 22:36:40 -04:00
TheDZD
a34f6a9877 Merge pull request #5437 from Fox-McCloud/remove-mutiny 
Removes Mutiny
 2016-08-14 22:34:25 -04:00
Isaac Erwin
11e86c434e Fixes talking swords being unable to their wielders, or anyone 2016-08-14 13:48:54 -04:00
Fox McCloud
d124d7e62a Merge pull request #5426 from Norgad/spicy 
Adds sprites for Coated Reinforced-Walls
 2016-08-13 23:08:09 -04:00
Isaac Erwin
8b9b28a3c5 Fixes welded fireclosets not showing up properly 2016-08-13 13:14:30 -04:00
Fox-McCloud
3dcc4bdecd Removes Mutiny 2016-08-12 22:44:11 -04:00
Fox McCloud
739cf9102b Merge pull request #5339 from IcyV/Chameleon-Flag 
Adds an explosive chameleon-flag for traitors
 2016-08-12 18:59:31 -04:00
Fox McCloud
2c91a81f26 Merge pull request #5391 from tristan1333/master 
Spacepod Paint (Fixed)
 2016-08-12 18:51:28 -04:00
TheDZD
e944f176d6 Merge pull request #5418 from Fox-McCloud/malf-ai-rework 
Malf AI Rework
 2016-08-12 18:30:41 -04:00
Fox-McCloud
60f3b2d415 tweak 2016-08-12 18:21:13 -04:00
Chakirski
6041a2dd93 Diamond Engineers 2016-08-12 15:30:06 -05:00
Norgad
6c844081d4 i can sprite 
maybe
 2016-08-12 18:03:16 +12:00
IcyV
c89540a396 Fixes the flag sometimes not deleting right away. 
Hilarious to see chained explosions but not very practical.
 2016-08-11 12:02:03 -07:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud
08224f729c announcement fix 2016-08-11 09:13:44 -04:00
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
Fox-McCloud
0b23e2a497 Fixes Bandolier Sprite 2016-08-10 18:57:35 -04:00
Crazylemon64
72febc9602 Merge branch 'master' of github.com:ParadiseSS13/Paradise into spacemanager_fix 2016-08-10 15:25:25 -07:00
TheDZD
91f18ac1d7 Merge pull request #5393 from Fox-McCloud/fast-processing 
Adds in Fast Processing
 2016-08-10 18:21:00 -04:00
TheDZD
6d280e52de Merge pull request #5375 from Fox-McCloud/formal-captain 
Formal Captain Update
 2016-08-10 18:12:09 -04:00
TheDZD
fea52d62b7 Merge pull request #5390 from Fox-McCloud/no-lag 
Makes Resting Less Laggy
 2016-08-10 18:09:31 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
 2016-08-10 14:16:42 -07:00
Fox McCloud
daec491d4e Merge pull request #5268 from Crazylemon64/space_allocation 
Removes most hard-coded z level checks
 2016-08-10 17:07:36 -04:00
Fox McCloud
6162323bdc Merge pull request #5400 from chopchop1614/sena 
Removes coding fluff
 2016-08-10 16:33:52 -04:00
Fox McCloud
45cea819c8 Merge pull request #5325 from DaveTheHeadcrab/glove_revert 
Revert "ERT Gloves"
 2016-08-10 16:31:08 -04:00
Crazylemon64
21dd91d031 Curse you automerge 2016-08-10 11:14:00 -07:00
Crazylemon64
1b93ce9b8b Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation 2016-08-10 11:02:05 -07:00
SamCroswell
fefe31211b Combat Gloves - ERT Commander 2016-08-10 13:28:05 -04:00
Aurorablade
d92447203c Fixes #5202 2016-08-10 01:37:34 -04:00
Fox-McCloud
35bfe2f917 prevents duplicates 2016-08-09 22:03:12 -04:00
chopchop1614
31b189f154 removes coding fluff 2016-08-09 23:24:47 +01:00
Fox-McCloud
8cd140e48a Adds in Fast Processing 2016-08-09 06:55:00 -04:00
Tristan B
0f7d23dafd spesspod paint fix 2016-08-09 19:15:13 +10:00
Fox-McCloud
11155b261a Merge remote-tracking branch 'upstream/master' into formal-captain 2016-08-09 05:14:39 -04:00
Fox-McCloud
94340f2548 Makes Resting Less Laggy 2016-08-09 05:06:21 -04:00
Krausus
2bec576fdc Adds qdels for some temporary humans 2016-08-09 02:58:36 -04:00
Fox McCloud
607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
Fox McCloud
86d0c0b2b9 Merge pull request #5147 from KasparoVy/tail-markings 
Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
 2016-08-08 21:58:45 -04:00
Fox McCloud
e708dcc482 Merge pull request #5282 from FreeStylaLT/burn_baby_burn 
DISCO INFERNO (Adds wall melting, makeable Coated rwalls)
 2016-08-08 21:57:18 -04:00
TheDZD
f7b6928a9f Merge pull request #5355 from Fox-McCloud/malf-ai-update 
Malf AI Powers Update
 2016-08-08 21:30:12 -04:00
TheDZD
a1448a10d8 Merge pull request #5367 from Fox-McCloud/fix-copies 
Illusion Simple Animals Have Attack Sounds
 2016-08-08 20:37:56 -04:00
TheDZD
4c3db67479 Merge pull request #5369 from Fox-McCloud/portal-fix 
Wormhole Event Fix, Portal GC Fix
 2016-08-08 20:37:27 -04:00
Fox-McCloud
989b629de4 crown and shoes 2016-08-08 19:36:41 -04:00
Fox-McCloud
0694a35da4 Formal Captain Update 2016-08-08 19:01:37 -04:00
Crazylemon64
1d7b94d71a I thought I fixed this 2016-08-08 14:18:43 -07:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/objective.dm
 2016-08-08 06:21:02 -07:00
Fox-McCloud
340d397382 Wormhole Event Fix, Portal GC Fix 2016-08-08 09:03:30 -04:00
Crazylemon64
b3df33962f Shuffles around BeforeChange 2016-08-08 00:07:12 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Fox McCloud
b1c87f319d Merge pull request #5316 from Crazylemon64/map_writer 
Adds a "Save" buildmode
 2016-08-08 02:34:02 -04:00