cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 00:52:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,878 Commits 26 Branches 2 Tags
1c1ebc3f3f2575d37eee9fe7eee37a40d7132e9d
Commit Graph

8750 Commits

Author SHA1 Message Date
ZomgPonies
1c1ebc3f3f Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits 
Syndi hardsuits
 2015-02-22 08:27:38 -05:00
ZomgPonies
bb620841a1 Merge pull request #375 from Fox-McCloud/Thickmaterial 
Thickmaterial
 2015-02-22 08:26:02 -05:00
Fox-McCloud
232eaaac72 Revert "Revert "Tail Wagging System"" 
This reverts commit eb4f2af194.
 2015-02-22 04:41:02 -05:00
Fox-McCloud
10c06a71a2 Revert "Revert "Death Wagging"" 
This reverts commit 1c32a43506.
 2015-02-22 04:40:34 -05:00
ZomgPonies
c91558b095 Merge pull request #379 from Markolie/master 
Bug fixes
 2015-02-21 15:02:56 -05:00
Markolie
d2dcb7a041 Fix AI tracking, atmospherics construction, blob talk fix, ERT radio fix 2015-02-21 20:56:55 +01:00
ZomgPonies
660ce3454b COMIC mutation bugfix 2015-02-21 13:25:09 -05:00
Fox-McCloud
edde2d10c6 Dart and Syringegun 2015-02-21 09:54:02 -05:00
ZomgPonies
6958c6f1bb Typo fix 2015-02-21 09:38:50 -05:00
ZomgPonies
ad8d879349 Adds a public clown language 2015-02-21 09:37:45 -05:00
ZomgPonies
b0a3d7e1cc Everyone should have check new players 2015-02-21 09:25:43 -05:00
Fox-McCloud
2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
Markolie
63ceaad3ec Make sure dead people don't get a typing indicator 2015-02-21 02:50:46 +01:00
Mark van Alphen
d126a98527 Merge pull request #371 from TheDZD/changeling 
Changeling Bugfixes
 2015-02-21 02:32:26 +01:00
ZomgPonies
dd79cb9ef2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-20 19:26:30 -05: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
8734b03ca3 Merge branch 'drones' of https://github.com/ZomgPonies/NewParadise into ZomgPonies-drones 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
 2015-02-20 18:54:18 -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
Fox-McCloud
99d92aea35 Buckshot 2015-02-20 04:46:53 -05:00
Fox-McCloud
eb4f2af194 Revert "Tail Wagging System" 
This reverts commit 70a231f2dc.
 2015-02-20 03:32:00 -05:00
Fox-McCloud
1c32a43506 Revert "Death Wagging" 
This reverts commit bbb4900197.
 2015-02-20 03:30:36 -05:00
Fox-McCloud
be2e754706 Syndicate Rebalance 2015-02-20 03:14:12 -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