cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,796 Commits 26 Branches 2 Tags
2c6d2f07fca621638df533f75e355eb5ebfa0bb4
Commit Graph

15057 Commits

Author SHA1 Message Date
ZomgPonies
2c6d2f07fc Fix PDA bug 2015-02-20 19:56:57 +01:00
Markolie
c89e3ac1eb Revert "Revert "Emergency communications hotfix"" 
This reverts commit 3ea36839a8.
 2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay"" 
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-02-20 17:46:35 +01:00
ZomgPonies
f27b2dcd9b Merge pull request #345 from Artorp/spacepod 
Added repair functionality to spacepods
 2015-02-20 09:02:03 -05:00
ZomgPonies
76237792ca Merge pull request #327 from tigercat2000/FreezeMob 
Port of  admin freeze verb from NSS Pheonix [FEATURE] [Do Not Merge]
 2015-02-20 07:44:54 -05:00
ZomgPonies
a1975aeca9 Merge pull request #344 from FalseIncarnate/master 
[Feature] Fire Hot! Color Coded Fires
 2015-02-20 07:43:27 -05:00
ZomgPonies
554765f49a Merge pull request #342 from Fox-McCloud/MiningSounds 
Mai Immershun
 2015-02-20 07:42:34 -05:00
Tigercat2000
826ccaed70 Extra Freeze features- Prevent direct touching and pulling 2015-02-20 05:16:03 +01:00
Tigercat2000
4345506c9c Merge branch 'master' of github.com:ParadiseSS13/Paradise into FreezeMob 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2015-02-20 03:52:58 +01:00
DZD
8193c0ab8e Makes things compile 2015-02-19 20:47:57 -05:00
DZD
212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD
590cb5e457 Merge remote-tracking branch 'upstream/master' into flags 2015-02-19 20:01:42 -05:00
DZD
5cad457f94 Span class fix 2015-02-19 20:01:23 -05:00
Mark van Alphen
3ea36839a8 Revert "Emergency communications hotfix" 2015-02-20 01:58:54 +01:00
ZomgPonies
d4a59ea39c Merge pull request #349 from Markolie/master 
Emergency communications hotfix
 2015-02-19 19:49:49 -05:00
Markolie
ccea2ce151 Emergency communications hotfix 2015-02-20 01:47:32 +01:00
DZD
d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -05:00
DZD
c11bb0d283 Fixes bugs 
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
 2015-02-19 19:32:58 -05:00
ZomgPonies
043a5e0e31 Merge pull request #331 from Markolie/master 
Saycode/language/species port from Bay
 2015-02-19 19:07:25 -05:00
Markolie
bc31d1e234 Changeling language fix 2015-02-20 01:02:20 +01:00
Markolie
46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
ZomgPonies
4be5819122 Merge pull request #339 from Fox-McCloud/Explosives 
Chem Boom Nerf
 2015-02-19 17:39:27 -05:00
Artorp
8182592811 Fixed MouseDrop_T runtime error 
runtime error: undefined variable /obj/spacepod/sec/var/stat
 2015-02-19 15:20:28 +01:00
Artorp
9c926342d0 Spacepod: Added more feedback when interacting 2015-02-19 15:11:00 +01:00
Artorp
1c5eec9227 Added repair functionality to spacepods 
- One welder use consumes 3 fuel and repairs 10 hull damage
- Fully repairing a sec spacepod requires around 40-42 activations,
welder must be refueled every 6 uses
 2015-02-19 14:46:39 +01:00
FalseIncarnate
3a0356adf0 Fire Hot! 
Adds new color coded fires, determined by the temperature of the air.
This will allow you to roughly approximate the temperature of fires even
from the other side of walls based on their glow.

In order from coolest to hottest (all temperatures are in Kelvin):
- "Black fire": Below 75K
- Red fire: Between 75K and 1100K
- Orange fire: Between 1100K and 1300K
- Yellow fire: Between 1300K and 1500K
- White fire: Between 1500K and 1800K
- Cyan fire: Between 1800K and 5300K
- Blue fire: Between 5300K and 7150K
- Dark Blue / Purple fire: Between 7150K and 9000K
- "Rainbow Fire": Over 9000K

Due to some issues with sprite editing, I temporarily disabled the use
of 2/3 of the fire tile sprites until I can properly update them while
maintaining their transparent portions. Until this is done,, all fires
will use the highest firelevel sprite set.
 2015-02-19 06:44:20 -05:00
Fox-McCloud
6ef9346af7 Flash Powder Fixup 2015-02-18 23:51:54 -05:00
Fox-McCloud
beae1bbe0f Mai Immershun 
The hills are filled with the sounds of mining
 2015-02-18 23:14:28 -05:00
Markolie
7e635a967e Fix compile 2015-02-19 01:40:28 +01:00
Markolie
e4ff0bb168 Disable mecha short circuit sparks - lag inducing 2015-02-19 01:39:03 +01:00
Markolie
dad0b2d856 Fix AI tracking, karma message fix, karma say fix, robot storage sprite change 2015-02-19 01:05:00 +01:00
Fox-McCloud
1812a36113 Chem Boom Nerf 2015-02-18 17:13:58 -05:00
ZomgPonies
69a7d19380 Compile fix & Latejoin heads get added to target lists 2015-02-18 16:27:46 -05:00
ZomgPonies
a780eccdaf Check Antagonist Rev Extra Head Bug 2015-02-18 16:02:25 -05:00
DZD
a299793ab8 Makes code compile again 
Fixing merge conflicts had the sideffect of adding one instance of
canremove, and one of drop_from_inventory.
 2015-02-18 13:50:36 -05:00
DZD
4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
Artorp
75e0841dff Fixed detective laptop security access 2015-02-18 19:37:23 +01:00
DZD
fbd9c367c0 NODROP flag addition & handling 
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
 2015-02-18 13:22:41 -05:00
Mark van Alphen
87ed05c146 Merge pull request #326 from Artorp/AutolatheQueue 
Added queue functionality to the autolathe
 2015-02-18 16:16:05 +01:00
Mark van Alphen
b407810e07 Merge pull request #324 from ZomgPonies/rev 
New +MENTOR permission for mentors
 2015-02-18 16:15:44 +01:00
ZomgPonies
6558590cb3 Fixed MAX SCIENCE moved admin verbs around 2015-02-18 09:21:31 -05:00
Mark van Alphen
6e168cb020 Merge pull request #333 from ZomgPonies/master 
Fix rev highpop feature
 2015-02-18 05:05:29 +01:00
ZomgPonies
bb40f463e8 Hurr durr 2015-02-17 18:59:50 -05:00
ZomgPonies
97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds 
Sounds
 2015-02-17 18:44:54 -05:00
ZomgPonies
7db0bf1d93 Fix rev highpop feature 2015-02-17 18:39:38 -05:00
Markolie
b5cf9bf51b Cryokinesis fix 2015-02-18 00:32:52 +01:00
Markolie
e868c66ad9 Fix warning 2015-02-17 23:55:26 +01:00
Markolie
b39a86078e Let ghosts use teleporter 2015-02-17 23:53:57 +01:00
Markolie
2adf44e4a1 Borer, pAI and posibrain language fix 2015-02-17 23:36:46 +01:00