cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-27 01:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,799 Commits 29 Branches 2 Tags
f56b79f080fdfb7b9bc153d762ed1b1708cc25ca
Commit Graph

1359 Commits

Author SHA1 Message Date
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
d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -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
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
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
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
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
ZomgPonies
91b0a3553f Check new players to mentors and view variables to mods and up 2015-02-17 15:12:55 -05: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
c218a2457f New +MENTOR permission for mentors 2015-02-17 02:28:00 -05: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
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
ZomgPonies
66be012a9c Fixes attacklog toggle not saving accross rounds 2015-02-15 12:23:21 -05:00
Markolie
85781b8d4c Indent fix 2015-02-14 18:09:35 +01:00
Markolie
f175000ceb Custom fax name check 2015-02-14 18:06:44 +01:00
Markolie
cbc8be2b4f Fax stamp update 2015-02-14 17:20:18 +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
Markolie
e15975e008 Fix typo 2015-02-14 01:32:38 +01:00
Markolie
61e9fe3b28 Admin fax overhaul 2015-02-13 20:46:19 +01:00
Markolie
eb71439e7f Dodgeball 2015-02-13 01:28:55 +01:00
Markolie
8ebc090480 Fix vampire oversight 2015-02-13 01:13:09 +01:00
Markolie
493be57db3 Update one click antag panel 2015-02-13 01:12:41 +01:00
Fox-McCloud
c78368a3e8 Merge pull request #281 from ZomgPonies/master 
[BALANCE][BUGFIX] Singuloth Knight item balance & Small Bugfixes
 2015-02-10 21:35:48 -05:00
Markolie
64fe9e8600 Remove legacy viewpoint code, move back to Bay's and /tg/'s system 2015-02-10 17:02:27 +01:00
ZomgPonies
39619bdf62 Tuned Singuloth Knight item balance. 2015-02-09 22:41:20 -05:00
Markolie
288ccd0c37 Add jobban options to the unban panel 2015-02-09 23:25:30 +01:00
Fox-McCloud
fb70920bc3 Merge pull request #254 from Markolie/master 
Bug fixes, latejoining additions
 2015-02-05 20:26:20 -05:00
Markolie
36f5bd0c52 Add AI latejoining, fix Ofitser again, blob damages pods 2015-02-05 14:58:12 +01:00
Fox-McCloud
8667786655 Crossbow Rework 2015-02-03 23:35:09 -05:00
Markolie
c4f11b6693 Extra jobban checks 2015-02-01 16:38:17 +01:00
Markolie
2a1e9931a6 Add shuttle stranding 2015-02-01 16:05:43 +01:00
Markolie
409dd8cfce Fix some oversights 2015-01-31 19:54:24 +01:00
Markolie
c520856716 Additional jobban options, minimum account age for antags 2015-01-31 19:48:48 +01:00
Markolie
56cd293f4b Unused/WorkInProgress folder cleanup 2015-01-31 16:40:29 +01:00
ZomgPonies
9d9bdfc0ea Re-adds hawke stuff under generic DS Officer 2015-01-30 17:39:27 -05:00
ZomgPonies
f738eda7c7 Select Equipment update/SK 
-Removing the Hawke snowflake gear from the select equipment list
-Only -roles- should be added, not your personal gear.
-Fixing up the ID's so they actually show the job on the ID card name
also
-Adding singuloth knights.
 2015-01-30 14:01:36 -05:00