cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,610 Commits 14 Branches 2 Tags
08a060501b2e69930df4d80fca8d0f8fd4737b3d
Commit Graph
4610 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SkyMarshal 08a060501b Merged in Erthilo's stuff. 2012-03-29 21:11:17 -07:00
SkyMarshal 0db83556e6 Merge pull request #752 from Erthilo/master 
Looks good to me.
 2012-03-29 21:07:49 -07:00
SkyMarshal b24d17ddeb Fixed a small error. 2012-03-29 21:00:06 -07:00
Ren Erthilo 4a0236734b Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-30 04:50:06 +01:00
Ren Erthilo a87ad6b291 Reverted electric chair changes. 2012-03-30 04:47:46 +01:00
SkyMarshal 0c34286018 Fixes errors from last commit. 2012-03-29 20:44:11 -07:00
SkyMarshal 61820bc5ec Final commit of the examine/damage overhaul. 2012-03-29 20:44:10 -07:00
SkyMarshal 01d2d5f339 WIP bloodloss and scaring system. 2012-03-29 20:42:08 -07:00
Ren Erthilo fa49d4514f Missed one. 2012-03-30 04:24:28 +01:00
Ren Erthilo 6952bef874 Reverting disabilities, headsets, murder sydie pack, photo removal, isbreathing and internals. 2012-03-30 04:19:22 +01:00
Mloc e368330143 Merge pull request #768 from Abi79/master 
Fixed a runtime error related to the group_multiplier of an air mixture being 0
 2012-03-29 13:51:04 -07:00
Albert Iordache 159fd0bfc9 Fixed a runtime error related to the group_multiplier of an air mixture being 0 
In certain cases, zones would be emptied completely of turfs, thereby causing division by zero errors in FEA due to operations involving group_multiplier.
 2012-03-29 23:45:48 +03:00
pobiegaandAlbert Iordache 382582ca18 Fixed non-admins not showing in IRC-bot player list. 2012-03-29 17:05:45 +08:00
SkyMarshal 736c3f46e1 Final commit of the examine/damage overhaul. 2012-03-28 22:37:08 -07:00
Albert Iordache 737459a8d9 Merge pull request #763 from Miniature/master 
More custom items, for Serithi and Gvazdas.
 2012-03-28 22:06:24 -07:00
Ren Erthilo 75a0bb49b7 Fixes for viewing skills mid-round. Changed title capitalisation. 2012-03-29 01:57:31 +01:00
Miniature b15a978b99 durp 2012-03-29 11:21:04 +10:30
Miniature 34bd0cd46b More custom items, for Serithi and Gvazdas. 2012-03-29 10:31:09 +10:30
Ren Erthilo 79af13e40e Map changes to toxins to allow use of gas extractor. 2012-03-28 22:52:35 +01:00
Ren Erthilo 78b9e9928a Reverts descriptions/names and old syndicate uplink. Adds sprites for advanced medical items. 2012-03-28 22:52:00 +01:00
Ren Erthilo da7244abda Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-28 22:25:07 +01:00
Albert Iordache 3c3231d061 Updated admins.txt 2012-03-28 23:57:20 +03:00
Albert Iordache 770401b7f6 Merge pull request #762 from pobiega/master 
Added surgery crate to QM ordering terminal.
 2012-03-28 13:47:35 -07:00
Pobiega 3f07ef38b3 Added surgery crate to QM. Contains all surgery tools and requires access_medical to open. 2012-03-28 18:28:39 +02:00
headswe c9d159d26c Merge pull request #760 from pobiega/patch-1 
Gives IRC-bot correct information and fixed chaplain getting rank 0 traitor objectives
 2012-03-28 07:45:31 -07:00
pobiega fff2743184 Chaplain-duplicate GetRank fixed, now correctly returns rank 1. 2012-03-28 16:47:13 +03:00
pobiega eb8dc9a76f Stealth-admins can now hide from IRC-bot. 
IRC-bot can now detect admins on server.
 2012-03-28 16:45:19 +03:00
Miniature 02f27afe74 Merge pull request #759 from Miniature/master 
Revert "Made space heaters work"
 2012-03-28 06:20:49 -07:00
Miniature 6f2726abb0 Revert "Made space heaters work" 
This reverts commit f772804da7.

Broke vent pumps a bit
 2012-03-28 23:50:15 +10:30
Ren Erthilo 276fc39010 Adds message for people breaking out of cuffs. 2012-03-28 09:57:49 +01:00
Miniature e127cf83b4 Merge pull request #757 from Miniature/master 
Made space heaters work
 2012-03-27 23:12:41 -07:00
Miniature f772804da7 Made space heaters work (might break other stuff, maybe, I believe someone was working on making high pressures hurt people, no idea how that's being done so that might be an example) 2012-03-28 16:40:28 +10:30
Ren Erthilo bbc40f27ee Some merge fixes, changed Malf laws to regular AI ones, changes for the AI and Cyborgs hints, and an actual fix for implanting rev heads. 2012-03-28 03:45:36 +01:00
Ren Erthilo 463fec60b5 Gamemode fixes for TG update. 2012-03-28 01:17:53 +01:00
Mloc 5f57b7e57d Merge pull request #755 from CIB/master 
Bugfix to swinging
 2012-03-27 13:13:16 -07:00
cib a322e2ba7c Fixed self-murdering with heavy blunt objects. 2012-03-27 08:30:38 -08:00
Jim "Apples" c8d56906d8 Merge pull request #754 from pobiega/patch-1 
Fixing "NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER" errors.
 2012-03-27 09:01:32 -07:00
pobiega 9b2c8d0928 Update code/game/jobs/jobs.dm 2012-03-27 18:55:39 +03:00
Albert Iordache a38f602444 Added some asserts for FEA code, to help fix a runtime error. 2012-03-26 20:01:43 +03:00
Ren Erthilo 470d767369 Reverting registered_name change. Reverting area name changes. Reverts Plasma Steel and object changes. 2012-03-26 15:47:39 +01:00
SkyMarshal d65a912c8e WIP bloodloss and scaring system. 2012-03-25 20:45:00 -07:00
Ren Erthilo 024f1abd2a Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-26 03:25:00 +01:00
Ren Erthilo 089e844be9 A large amount of groundwork for /tg/ code. Comes with some gameplay changes. 
* + You now take severe brute damage in environments over 750kPA. A new HUD icon warns you when it's above 500kPA. Space suits block this.
* > Welding fuel tanks explode when shot.
* > Riot shields prevent you from being pushed.
* > People cannot be shoved when being pulled and handcuffed.
* > The internals button on the hud now works for tanks in almost any area, such as your pocket.
* > No more popups when you insert your ID into your PDA. There's a link in the PDA menu to update info.
* - Removed photo system from ID's as it doesn't work.
 2012-03-26 03:16:01 +01:00
Jim "Apples" bea9745e9c Merge pull request #751 from SkyMarshal/Airlocks 
Portalathe fix, Magboots + airflow fix, Fix for the "MODE" job, fixed re...
 2012-03-25 15:50:37 -07:00
SkyMarshal 879f8c941a Portalathe fix, Magboots + airflow fix, Fix for the "MODE" job, fixed removing gravity catapult, fixed death alarms prematurely detonating. 2012-03-25 15:33:14 -07:00
Ren Erthilo 4c6d0f2489 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-25 18:44:28 +01:00
Hawk-v3 18026660bc Merge pull request #750 from AppleMaster/master 
Fix #1
 2012-03-25 09:31:09 -07:00
Apple_Master 8f5c17e4da A fix for ""Station Engineer" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO SKYMARSHAL A CODER". Ta Pobiega <3 
Signed-off-by: Apple_Master <cheeckan@gmail.com>
 2012-03-25 17:24:05 +01:00
CIB f7025f1eaa Merge pull request #749 from SkyMarshal/Airlocks 
Adds in the option to specify UID (The hexadecimal references) when you are variable editing.
 2012-03-25 03:10:22 -07:00
SkyMarshal e074b9f97e Adds a similar system to the proccall system. 2012-03-25 02:49:18 -07:00