d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
f56b79f080
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-02-20 11:45:56 -05:00
626049570b
Fixed handcuffs, legcuffs and others
2015-02-20 11:37:05 -05:00
8c1e95307d
Fixes clicking not turning you
2015-02-20 11:24:56 -05:00
02bd38525b
Fix PDA bug
2015-02-20 11:17:03 -05:00
5d7d229861
Overhaul of canister variables
...
- Moves reference lists to their own datum
- Changes to nanoUI data gathering, large variables are no longer stored
on the atom
2015-02-20 16:23:43 +01:00
f27b2dcd9b
Merge pull request #345 from Artorp/spacepod
...
Added repair functionality to spacepods
2015-02-20 09:02:03 -05:00
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
a1975aeca9
Merge pull request #344 from FalseIncarnate/master
...
[Feature] Fire Hot! Color Coded Fires
2015-02-20 07:43:27 -05:00
554765f49a
Merge pull request #342 from Fox-McCloud/MiningSounds
...
Mai Immershun
2015-02-20 07:42:34 -05:00
99d92aea35
Buckshot
2015-02-20 04:46:53 -05:00
eb4f2af194
Revert "Tail Wagging System"
...
This reverts commit 70a231f2dc
2015-02-20 03:32:00 -05:00
1c32a43506
Revert "Death Wagging"
...
This reverts commit bbb4900197
2015-02-20 03:30:36 -05:00
be2e754706
Syndicate Rebalance
2015-02-20 03:14:12 -05:00
826ccaed70
Extra Freeze features- Prevent direct touching and pulling
2015-02-20 05:16:03 +01:00
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
bbb4900197
Death Wagging
2015-02-19 21:49:45 -05:00
2e848c2c37
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-19 20:59:41 -05:00
8193c0ab8e
Makes things compile
2015-02-19 20:47:57 -05:00
212ca5f5bd
MERGE CONFLIIIIIICTS
2015-02-19 20:26:36 -05:00
d54579850c
Revert "Saycode/language/species port from Bay"
2015-02-19 20:15:42 -05:00
590cb5e457
Merge remote-tracking branch 'upstream/master' into flags
2015-02-19 20:01:42 -05:00
5cad457f94
Span class fix
2015-02-19 20:01:23 -05:00
3ea36839a8
Revert "Emergency communications hotfix"
2015-02-20 01:58:54 +01:00
d4a59ea39c
Merge pull request #349 from Markolie/master
...
Emergency communications hotfix
2015-02-19 19:49:49 -05:00
ccea2ce151
Emergency communications hotfix
2015-02-20 01:47:32 +01:00
70a231f2dc
Tail Wagging System
2015-02-19 19:41:40 -05:00
d0d6c8eebd
Merge with upstream/master
...
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
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
043a5e0e31
Merge pull request #331 from Markolie/master
...
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
bc31d1e234
Changeling language fix
2015-02-20 01:02:20 +01:00
46c53be6f1
Part 2 of saycode/language/species port from Bay. Also includes bugfixes.
2015-02-20 00:50:28 +01:00
2c6da21cf8
Fix
2015-02-19 17:54:19 -05:00
4be5819122
Merge pull request #339 from Fox-McCloud/Explosives
...
Chem Boom Nerf
2015-02-19 17:39:27 -05:00
abd2a3d48f
Additional drone icons
2015-02-19 17:29:15 -05:00
8182592811
Fixed MouseDrop_T runtime error
...
runtime error: undefined variable /obj/spacepod/sec/var/stat
2015-02-19 15:20:28 +01:00
9c926342d0
Spacepod: Added more feedback when interacting
2015-02-19 15:11:00 +01:00
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
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
6ef9346af7
Flash Powder Fixup
2015-02-18 23:51:54 -05:00
beae1bbe0f
Mai Immershun
...
The hills are filled with the sounds of mining
2015-02-18 23:14:28 -05:00
7e635a967e
Fix compile
2015-02-19 01:40:28 +01:00
e4ff0bb168
Disable mecha short circuit sparks - lag inducing
2015-02-19 01:39:03 +01:00
dad0b2d856
Fix AI tracking, karma message fix, karma say fix, robot storage sprite change
2015-02-19 01:05:00 +01:00
1812a36113
Chem Boom Nerf
2015-02-18 17:13:58 -05:00
69a7d19380
Compile fix & Latejoin heads get added to target lists
2015-02-18 16:27:46 -05:00
a780eccdaf
Check Antagonist Rev Extra Head Bug
2015-02-18 16:02:25 -05:00
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
4bcdb94a99
Merge with upstream/master
...
Fixes conflicts
2015-02-18 13:41:32 -05:00
75e0841dff
Fixed detective laptop security access
2015-02-18 19:37:23 +01:00
Markolie