cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 22:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,589 Commits 26 Branches 2 Tags
da7244abdae7cfd2b8ea6ad216b23338affc0f9d
Commit Graph

563 Commits

Author SHA1 Message Date
Ren Erthilo
da7244abda Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-28 22:25:07 +01:00
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
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
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
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
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
Albert Iordache
7488bb6aa8 Merge pull request #730 from CIB/master 
Swing attack and Skill System updates
 2012-03-25 00:48:49 -07:00
SkyMarshal
5c0ddb031d Merge pull request #738 from Erthilo/master 
Adds alternate CMO labcoat, engineering crates need proper access, test code for implant only taser firing, changes to overdose, and more bugfixes
 2012-03-24 18:04:03 -07:00
SkyMarshal
f45aff1bae Chameleon Jumpsuit now has armor, space tiles now get generated faster, fixed fingerprint runtime, optimized autosay, fixed crates + package wrappers, retired admins are no longer spammed, can now click through blindness, packages and evidence bag contents now count toward traitor objectives, stunning and such stops you instantly, guncode improvements. 2012-03-24 17:21:31 -07:00
Ren Erthilo
c4090c0d3d Added alternate CMO labcoat which is slightly less blue. Also some test code for implant only weapons, not implemented. 2012-03-23 20:15:24 +00:00
Ren Erthilo
0b71f0337c Small fix for implanting head revs 2012-03-23 03:26:32 +00:00
cib
7ee2b8f79e Added a swing mechanic. 2012-03-22 14:53:29 -08:00
Ren Erthilo
176ed8f3ea Adds facial reconstruction surgery. Config change for custom items. 2012-03-22 20:41:09 +00:00
Mloc
749b412093 Merge pull request #726 from CIB/master 
Alcohol fixes, also more, see commit messages
 2012-03-22 05:15:51 -07:00
cib
42e21b3447 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-21 20:10:26 -08:00
cib
f041bc7063 Rebalance of the melee damage system. 
- Heavy objects now take longer to swing and deal more damage.
- A hit to the head is more likely to knock you out.
- A hit to the torso with a heavy object is more likely to knock you down.
 2012-03-21 20:10:13 -08:00
CIB
bd745b5e30 Merge pull request #725 from Erthilo/master 
New Engineering Space Suits, health analysers detect bone fractures, pulling lying down people is slower, and some fixes
 2012-03-21 13:00:31 -07:00
Ren Erthilo
fd338632c5 Fix for machine messages. Fix for previous health analyser commit. Added New Engineering Space Suits. Prevented wasting resources while fixing cyborgs. 2012-03-21 19:30:48 +00:00
SkyMarshal
b86cd6bda4 MAde appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels. 2012-03-21 09:46:42 -07:00
Ren Erthilo
61a82b22bb Fix for labeling virus dishes. Removed health analyzer from first-aid kit. 
Made bruise packs and ointment only work above 50 health.
Added advanced treatment for future use.
Made MD's and CMO spawn with health analyzers.
Reduced medical equipment in non-medbay areas.
Made Health Scanner HUDs displays more granular.
 2012-03-15 21:46:11 +00:00
SkyMarshal
df5909446e Merge pull request #634 from Miniature/master 
Attack logging (finally)
 2012-03-07 20:49:02 -08:00
Miniature
cf53a0cc7a Attack logging (finally) 
there might be some things I missed, and feel free to change the messages if you want
 2012-03-08 15:16:54 +10:30
SkyMarshal
7bc39b8733 Few more bugfixes. 2012-03-07 16:21:17 -07:00
SkyMarshal
c522b5db7b Holy shit did that speed things up. 2012-03-06 21:09:56 -07:00
Ren Erthilo
87502c38b7 Made emagged cyborgs laws gender neutral and use crew. Small reset module description change. 2012-03-06 10:22:34 +00:00
Ren Erthilo
b92ecb932b Added custom items. Small fix for labcoat buttons and descriptions. 2012-03-05 17:52:28 +00:00
Albert Iordache
3fcf067310 Merge pull request #613 from SkyMarshal/master 
Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event, fixed Tajspeak, fixed the blob, fixed overdoses
 2012-03-03 23:55:37 -08:00
comma
5ad05105f4 Small bugfix to ashtrays and cig butts 
Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore.
Also glass ashtray now shatters with sound
 2012-03-04 06:45:14 +02:00
SkyMarshal
3e3534f00b Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event. 
Map update has a redone CE's office and AI upload.
Explosions now let admins jump to them.
 2012-03-03 20:23:10 -07:00
comma
ef6473b964 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Now working
And without promoting myself as Game Master :P

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-03-03 03:16:30 +02:00
Albert Iordache
0fe9ef55c2 Merge pull request #586 from CIB/master 
Some enhancements to the monkey AI
 2012-03-02 12:25:46 -08:00
comma
ee09389f5b Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-03-02 22:04:20 +02:00
comma
2edd73627d Added ashtrays 
Breakable. Spill contents on breaking or hitting the solid stuff after being thrown.
Have limited capacity. Can be emptied in disposal outlet.
Change sprite when are half-filled and filled.
Also fiddled a bit with the cigs code, so you can put them out without dropping.
 2012-03-02 21:56:08 +02:00
Ren Erthilo
79501f3111 Changed AI laws to use crew instead of human. Left Asimov unchanged. Added more Ion Storms laws. 2012-03-02 18:25:28 +00:00
cib
e0a919be43 Monkeys now react to being attacked by doing emotes and trying to run away. 2012-03-01 16:03:55 -08:00
Hawk-v3
bbc12c6713 Subject: [PATCH 084/285] TG Updates: Cyborgs now get a message that their parent AI has had their laws modified. (For Kor) 2012-03-01 19:31:58 +00:00
Hawk-v3
bff678772a [PATCH 064/285] TG UPDATES: Santa's toy bag! 
Fixed some miscellaneous stuff to prevent round-start crashing.
 2012-03-01 03:25:14 +00:00
SkyMarshal
122ed8581f Merge pull request #569 from comma/master 
Randomized cig butt sprites (5 variations)
 2012-02-29 18:55:48 -08:00
comma
e066006f51 Randomized cig butt sprites 2012-03-01 04:44:28 +02:00
SkyMarshal
2b3fbc5047 Merge pull request #566 from Erthilo/master 
Added Notebook for the Detective
 2012-02-29 16:59:35 -08:00
Ren Erthilo
cf2b6ec28c Added Notebook for the Detective. 2012-03-01 00:23:29 +00:00
Mloc
9cee329958 Merge pull request #563 from SkyMarshal/master 
Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.
 2012-02-29 12:51:48 -08:00
SkyMarshal
4524a2ff10 Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space. 2012-02-29 13:48:16 -07:00
Tastyfish
373dc5937d Merge pull request #551 from SkyMarshal/master 
TG updates, improved nuke.
 2012-02-28 17:36:12 -08:00
SkyMarshal
66f38fb34b TG UPDATE: Updates to telecomms, bug&runtime fixes, manifest for all, improved nuclear bomb. 
All PDA's can access the manifest.
Nuclear bomb now works on realtime.
Telecomms not mapped yet.
Numerous Runtime Fixes
 2012-02-28 18:24:43 -07:00
Ren Erthilo
1d858a75a3 Accidentally picked the wrong files... 2012-02-28 19:15:21 +00:00
CIB
27fd036c87 Merge pull request #539 from SkyMarshal/master 
Fixed lasers, balanced nuke, removed stupid code, removed Karma, improved admin panel.
 2012-02-28 00:44:06 -08:00
SkyMarshal
b653c615be Replaced a lot of stupid from the wardrobes and package wrap, they now use an afterattack call instead of specific code for them in EVERY OTHER ITEM. 
Improved the admin panel.
Removed Karma.
 2012-02-28 00:11:15 -07:00