cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,849 Commits 29 Branches 2 Tags
5abc780fde74b4c5bc9dd39b78a55ddf3a0a51dc
Commit Graph

4434 Commits

Author SHA1 Message Date
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
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
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
Tigercat2000
826ccaed70 Extra Freeze features- Prevent direct touching and pulling 2015-02-20 05:16:03 +01:00
Fox-McCloud
bbb4900197 Death Wagging 2015-02-19 21:49:45 -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
Markolie
46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
ZomgPonies
2c6da21cf8 Fix 2015-02-19 17:54:19 -05:00
ZomgPonies
abd2a3d48f Additional drone icons 2015-02-19 17:29:15 -05:00
Markolie
dad0b2d856 Fix AI tracking, karma message fix, karma say fix, robot storage sprite change 2015-02-19 01:05:00 +01:00
DZD
4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05: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
Markolie
2adf44e4a1 Borer, pAI and posibrain language fix 2015-02-17 23:36:46 +01:00
Markolie
12b297219d Fix AI eye icon 2015-02-17 23:33:32 +01:00
Markolie
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Markolie
f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/machinery/atmoalter/canister.dm
 2015-02-17 02:12:22 +01:00
Markolie
d7f17f6eba Bug fixes, give roboticist toolbelt, AI recall shuttle option 2015-02-17 01:04:04 +01:00
Markolie
4d8481f83a Merge surgical borgs and crisis borgs 2015-02-16 22:47:55 +01:00
Markolie
95e18fd397 Solar update, convert solar to NanoUI 2015-02-16 21:35:34 +01:00
Markolie
8726bad5b0 Z-level check refactor 2015-02-16 20:33:28 +01:00
Markolie
ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Mark van Alphen
3bc771b15b Merge pull request #314 from Fox-McCloud/Cargo 
Cargo
 2015-02-16 06:52:16 +01:00
Fox-McCloud
1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud
0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
Markolie
56817e7d0a Ziptie restraint examine 2015-02-14 17:31:56 +01:00
Markolie
9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
Markolie
71319538df Vending machine overhaul, teleporter area fix, add events to status tab 2015-02-13 15:27:42 +01:00
Markolie
493be57db3 Update one click antag panel 2015-02-13 01:12:41 +01:00