cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,545 Commits 26 Branches 2 Tags
a9245dceeef6cf58c8b45bd1d0b89ba5eeec4e4d
Commit Graph

1108 Commits

Author SHA1 Message Date
Rob Nelson
d49e6d3bf4 Standardize CLUMSY 
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2014-01-21 22:49:22 -05:00
Rob Nelson
dd8c8c12ab Standardize XRAY. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:37:37 -05:00
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies
37cf92c4f8 Powers fix right file 2014-01-19 21:14:06 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
Ccomp5950
7541463e01 Moved Supermatter.dm out of the WorkInProgress directory. 
Conflicts:
	baystation12.dme
 2014-01-17 09:01:09 -05:00
ZomgPonies
2525a3d057 Added barber karma job 2014-01-16 08:42:36 -05:00
alex-gh
717f6b45be Supermatter no longer irradiates other Z levels 2014-01-13 07:28:43 +01:00
alex-gh
998285b64d Slightly tweaked Supermatter to make it a bit more dangerous and a bit less efficient 2014-01-13 07:10:44 +01:00
Rob Nelson
f9ce44e891 Fix atmos control computer. 2014-01-11 20:44:12 -05:00
YotaXP
b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
 2014-01-08 07:14:16 -05:00
ZomgPonies
af92092f64 Fixed Slimaggedon spawning -- Uses antag menu 2014-01-04 22:11:16 -05:00
ZomgPonies
271100c2fd Stupid bush killing my goose 2014-01-02 02:07:20 -05:00
ZomgPonies
a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies
dbb1e55cb4 Karma bugfix 2013-12-31 19:02:37 -05:00
ZomgPonies
3a88f33e0c Fixed up and re-added powerarmor 2013-12-28 17:21:25 -05:00
ZomgPonies
5661d24dc7 Updated ashtray code! 2013-12-22 06:36:27 -05:00
ZomgPonies
ebc01b39aa Guess IDs! 2013-12-22 06:36:19 -05:00
ZomgPonies
b0dca0269f Oldcode Fireworks! 2013-12-21 06:00:40 -05:00
ZomgPonies
4181829014 Revert "Revert "Some pretty awesome fire/airalarm fixes"" 
This reverts commit 2ec7b67db6.
 2013-12-15 04:21:05 -05:00
ZomgPonies
2ec7b67db6 Revert "Some pretty awesome fire/airalarm fixes" 
This reverts commit 0056c74db0.
 2013-12-15 01:47:35 -05:00
ZomgPonies
0056c74db0 Some pretty awesome fire/airalarm fixes 2013-12-14 06:47:24 -05:00
ZomgPonies
f902d31e67 More colored window stuff 2013-11-30 21:30:54 -05:00
ZomgPonies
8726cd1c9a Colored windows bugfix 2013-11-30 20:46:27 -05:00
ZomgPonies
d14866c354 Colored windows update 2013-11-30 18:30:12 -05:00
ZomgPonies
4c7fa06c23 Colored Windows 2013-11-30 16:33:53 -05:00
ZomgPonies
5a0763c7e4 Gave universal speak back to ponies because DUH 2013-11-29 07:06:25 -05:00
ZomgPonies
86ce80d9e1 New respawn system is in yay! 2013-11-28 16:44:48 -05:00
alex-gh
a1ab131abf Supermatter explosions are more dangerous now. The damage follows the inverse square law 2013-11-25 23:28:54 +01:00
ZomgPonies
3273ab1418 Econ and hud fixes 2013-11-25 06:12:56 -05:00
ZomgPonies
cc05932fb5 Emag ATM, cash bags! 2013-11-25 05:29:51 -05:00
ZomgPonies
57a94ae151 Merge pull request #61 from alex-gh/ai_sm_fix 
Supermatter no longer melts AIs and Cyborgs
 2013-11-24 18:48:34 -08:00
alex-gh
c26b7cb84c Supermatter no longer melts AIs and Cyborgs 2013-11-24 17:38:05 +01:00
ZomgPonies
227f4a1bc0 I guess slime people are now live. 2013-11-24 09:48:38 -05:00
alex-gh
460ef48b7c Reduced supermatter heat output 2013-11-21 20:08:20 +01:00
ZomgPonies
3464e27ac2 Karma message update 2013-11-20 20:53:39 -05:00
ZomgPonies
dec7ef26ad More turntable loops 2013-11-18 01:18:53 -05:00
ZomgPonies
9976b6aca7 Econ Fixes 2013-11-18 01:18:45 -05:00
ZomgPonies
fffcd7e49b Atmos Computer NanoUI 2013-11-18 01:17:59 -05:00
ZomgPonies
aa26226580 Turntables, Mixers and Lasershows. 2013-11-16 18:29:05 -05:00
ZomgPonies
950011d4d8 Organ lag fixes 2013-11-08 09:50:34 -05:00
ZomgPonies
988a9b7494 Fixes for Grey species 2013-11-07 16:16:20 -05:00
ZomgPonies
3e9b71ce19 karma fix 2013-11-06 20:21:27 -05:00
ZomgPonies
f222fb7f6e Oops karma shop feedback 2013-11-06 15:03:58 -05:00
ZomgPonies
307d853ef0 Ingame Karma Shop Menu 2013-11-06 13:56:58 -05:00
ZomgPonies
c5ebe7acaa Added 5 new types of random events 2013-11-05 08:08:01 -05:00
ZomgPonies
4bfad39ae3 Code Fixes 2013-11-04 19:47:34 -05:00
ZomgPonies
13985d2f4f Sayu grenade and assembly update 2013-11-04 14:31:58 -05:00
ZomgPonies
cc437cbd4b Belt of holding 2013-11-04 07:49:03 -05:00
ZomgPonies
b2b623cac8 Programmable cargo machines 2013-11-04 07:48:55 -05:00