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

8717 Commits

Author SHA1 Message Date
Markolie
efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Markolie
d2dcb7a041 Fix AI tracking, atmospherics construction, blob talk fix, ERT radio fix 2015-02-21 20:56:55 +01:00
Markolie
63ceaad3ec Make sure dead people don't get a typing indicator 2015-02-21 02:50:46 +01:00
Markolie
9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
Markolie
f17c266919 Fix lobby chatter 2015-02-20 21:13:51 +01: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
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
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
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
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
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
ZomgPonies
97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds 
Sounds
 2015-02-17 18:44:54 -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
ZomgPonies
d3a827f9e8 Move Fax Panel to Event tab since it's IC info 2015-02-17 15:13:07 -05:00
ZomgPonies
91b0a3553f Check new players to mentors and view variables to mods and up 2015-02-17 15:12:55 -05:00
ZomgPonies
8a0d5f05d8 Merge pull request #322 from Markolie/master 
Refactor announcement system, crew monitor overhaul, z-level checks, add portable crew monitor, fixes
 2015-02-17 14:05:49 -05:00
Artorp
e1eb2b9a1d Updated m_amt and g_amt to match their design 2015-02-17 18:52:31 +01:00
Tigercat2000
4be671c80e In accordance with MarkvA's recommendation, switches 'world' to 
'mechas_list'.
 2015-02-17 18:17:10 +01:00
Tigercat2000
d23d8af778 Port of freeze mob verb from NSS Pheonix 2015-02-17 18:04:31 +01:00
ZomgPonies
e2060f405e Downgrade list of potential ahelp subjects to 2: Complaint or Question 2015-02-17 09:21:22 -05:00
ZomgPonies
efe13b39bd Remove msay from mentors 2015-02-17 09:12:43 -05:00
ZomgPonies
03a08e931a Fixes problem with sound toggles. 2015-02-17 04:55:18 -05:00