Fox-McCloud
edde2d10c6
Dart and Syringegun
2015-02-21 09:54:02 -05:00
Fox-McCloud
2a1028324c
Thickmaterial Flag
2015-02-21 07:26:25 -05:00
Mark van Alphen
d126a98527
Merge pull request #371 from TheDZD/changeling
...
Changeling Bugfixes
2015-02-21 02:32:26 +01:00
ZomgPonies
5ac15e63f2
Merge pull request #348 from Fox-McCloud/Tail-Wagging
...
Tail Wagging System
2015-02-20 19:19:15 -05:00
DZD
5e977cbfc9
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-20 19:05:25 -05:00
ZomgPonies
07cdcb3cff
Merge pull request #367 from Markolie/master
...
Switch copytext and sanitize proc
2015-02-20 16:22:32 -05:00
Markolie
9fedfc7c62
Switch copytext and sanitize proc
2015-02-20 22:17:13 +01:00
ZomgPonies
108abfcf75
Merge pull request #365 from Markolie/master
...
Respawn as the new cargo mobs, language fixes
2015-02-20 15:19:06 -05:00
Markolie
f17c266919
Fix lobby chatter
2015-02-20 21:13:51 +01:00
ZomgPonies
533afdcdfe
Last saycode fixes
2015-02-20 15:12:23 -05:00
Markolie
8e265002db
Ensure silicons have galactic common
2015-02-20 21:07:44 +01:00
Markolie
db02e873d5
Respawn as the new cargo mobs
2015-02-20 20:38:57 +01:00
ZomgPonies
bb1d0c7a71
IC fax & comms console wrong staff
2015-02-20 14:28:39 -05:00
Mark van Alphen
63f08384d0
Disable typing indicator
...
Changes:
1) Disables the typing indicator for now.
2015-02-20 20:02:50 +01:00
Markolie
98fe1820a4
Disable typing indicator, fix radio toggle
2015-02-20 19:58:12 +01:00
ZomgPonies
6bac3781d0
Fixed handcuffs, legcuffs and others
2015-02-20 19:56:57 +01:00
ZomgPonies
2c6d2f07fc
Fix PDA bug
2015-02-20 19:56:57 +01:00
ZomgPonies
7e52595823
Merge pull request #358 from Markolie/master
...
Re-apply saycode
2015-02-20 12:15:43 -05: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
626049570b
Fixed handcuffs, legcuffs and others
2015-02-20 11:37:05 -05:00
ZomgPonies
02bd38525b
Fix PDA bug
2015-02-20 11:17: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
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
Fox-McCloud
bbb4900197
Death Wagging
2015-02-19 21:49:45 -05:00
DZD
2e848c2c37
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-19 20:59:41 -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
5cad457f94
Span class fix
2015-02-19 20:01:23 -05:00
Fox-McCloud
70a231f2dc
Tail Wagging System
2015-02-19 19:41:40 -05: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
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
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
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
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