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

3849 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
4b74e209b5 Medical Stacks 2015-02-21 21:34:58 -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
Fox-McCloud
2a1028324c Thickmaterial Flag 2015-02-21 07:26: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
Artorp
ef2c939872 Change space law iframe wiki link 2015-02-20 19:20:21 +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
Fox-McCloud
be2e754706 Syndicate Rebalance 2015-02-20 03:14:12 -05: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
8193c0ab8e Makes things compile 2015-02-19 20:47:57 -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
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
1812a36113 Chem Boom Nerf 2015-02-18 17:13:58 -05:00
DZD
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
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
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
ZomgPonies
97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds 
Sounds
 2015-02-17 18:44:54 -05:00
Markolie
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Artorp
e1eb2b9a1d Updated m_amt and g_amt to match their design 2015-02-17 18:52:31 +01:00
Tigercat2000
d23d8af778 Port of freeze mob verb from NSS Pheonix 2015-02-17 18:04:31 +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
Fox-McCloud
a03879d83f Sound Updates 2015-02-16 16:29:43 -05: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
1fdd281f19 Critter Crate Fix 2015-02-15 03:19:43 -05:00
Fox-McCloud
dbf4c84953 Merge pull request #311 from Markolie/master 
Ziptie restraint examine, fax panel adjustment
 2015-02-14 23:23:35 -05: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
0792a40379 Add zipties to secvender, replace box of handcuffs in warden's locker with zipties box 2015-02-14 22:31:31 +01:00
ZomgPonies
091d2c8348 Merge pull request #307 from Markolie/master 
Fix atmos meter, emag refactor, vending machine update, UI reworks, admin fax overhaul, other fixes
 2015-02-14 09:17:52 -05:00
Markolie
165f8118af Add box of zipties, give zipties to nuke ops and Vox raiders 2015-02-14 14:54:32 +01:00
Markolie
47e4126277 Add send time to fax, fix nest issue 2015-02-14 04:56:09 +01:00
Markolie
9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Tigercat2000
113fd94e88 Fix dressers to actually work. [BUGFIX] 2015-02-13 23:04:04 +01:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
DZD
723dc2ad98 ABSTRACT flag addition & handling 
- Adds ABSTRACT flag to relevant items, removes abstract var.
- Adds checks for ABSTRACT where relevant.
- Also removes extra define of golem gas mask.
- Adds NODROP to changeling mutations so I don't have to do that later.
 2015-02-12 18:49:26 -05:00
Markolie
6938ad7edc False rwalls now smooth with regular walls and vice versa 2015-02-12 23:37:54 +01:00