cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 00:57:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,489 Commits 17 Branches 2 Tags
e201bcbe0e9bd57e83af02e4e70c8a4e5a1d5014
Commit Graph
101 Commits
Author SHA1 Message Date
Tastyfish 53baf4755f Merge remote-tracking branch 'upstream/master' 2012-01-16 20:27:36 -05:00
Tastyfish df208f7189 added orderable chickens and cows 2012-01-16 20:26:17 -05:00
SkyMarshal 70cb3417ef Added weldpack, clipboards fit on belt, food and other things can now be wrapped 2012-01-12 11:13:05 -07:00
Tastyfish f404ea91d6 Merge pull request #260 from SkyMarshal/master 
Disposal updates + map fix, traitor objective fix, Cult teleport talisman now teleports grabs
 2012-01-10 20:38:14 -08:00
SkyMarshal 3b57d309cc Disposals are now much more robust, with sorters being program-able, food able to be packaged, people able to flush closets, proper construction of sorters, and a function on taggers to use a custom tag. 
In addition:
Made teleport talismans more amusing.
Fixed duplicate traitor objectives.
 2012-01-10 21:21:52 -07:00
cib 0340e5f58e More medical changes. 
- Added tramadol and oxycodone, both effective painkillers.
- Shock now takes drunkness into account.
- Added some firstaid stuff to the table in the medbay lobby, so people can do treatment when there's no doctors.
 2012-01-10 09:16:11 -08:00
SkyMarshal 25426e6f02 Merge pull request #254 from SkyMarshal/master 
Bugfix.
 2012-01-09 09:08:53 -08:00
SkyMarshal 46fb684c0b Bugfix for chem grenades and Disposals. 2012-01-09 09:58:33 -07:00
Tastyfish 1d010aca75 Merge remote-tracking branch 'upstream/master' 2012-01-08 20:06:03 -05:00
cib 66330222d3 Buffed the speed at which the chemistry charger generates chemicals, and also the power consumption. 2012-01-07 20:39:35 -08:00
SkyMarshal 5fd641599e Fixed stupid unescapable edit apperance 
Fixed some stupid with grenades.
 2012-01-07 00:49:48 -07:00
Tastyfish a7b85707dd porting in bones and dismemberment 2012-01-05 17:15:29 -05:00
cib f7be1250a3 Many improvements to vira. 
Implemented an efficient system for infection. Made sneeze and cough increase infection chance. Increased the lifespan of spaceacillin in a host. Removed the drool symptom.
 2011-12-30 21:07:52 -08:00
cib a902744264 A new breakthrough in quantum technology now allows you to convert energy to mass directly using the chem dispenser. Enabling this feature requires huge amounts of power, however. 2011-12-28 19:45:43 -08:00
SkyMarshal aac7a104eb More amusing message. 2011-12-27 14:32:05 -07:00
SkyMarshal 03445062c4 Reworked pepperspray's results 2011-12-27 14:26:08 -07:00
SkyMarshal 25400f7af4 Should be the rest for this lot. 2011-12-27 14:13:11 -07:00
Albert Iordache cfbb6eb704 Fixed a few errors. 2011-12-27 18:52:03 +02:00
cib 21876403bb Added new virology to the map. Radium now has a chance of awakening your immune system, but at the same time it has a chance of killing you. Added a dilluted milk recipe, and milk to the chem dispenser. 2011-12-26 01:26:35 -08:00
CIB123@gmail.comandAlbert Iordache 42890a7c4a TG update: Added antibody-based, random symptom virology. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2686 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 00:01:02 +02:00
uporotiyandAlbert Iordache ab396f50ac TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2683 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:39:45 +02:00
rockdtbenandAlbert Iordache f38a590009 TG update: Removed a proc that does nothing anymore. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2675 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 20:19:12 +02:00
SkyMarshal c6499583b4 Updated. 2011-12-25 00:07:42 -07:00
vageyenaman@gmail.comandAlbert Iordache 75c7670e75 TG update: Small changes and bugfixes: 
◦ Metroids can now be observed by ghosts.
   ◦ Saved User Interface preferences ("Old UI" & "New UI") now correctly get transferred to clones.
   ◦ Captain announcements now require the player to be next to the console. (Issue 220)
   ◦ Radio headsets no longer sometimes fail to deliver the messages (Issue 221)
   ◦ Some other insignificant back-end shenanigans.
   ◦ The pregame lobby now has title music. The gameticker chooses between two .ogg files on game start and plays that for everyone who joins. The music stops when create_character() gets called though.
   ◦ Gave some critters, namely "creature" and "blob" some attack sounds.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2655 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:15:22 +02:00
ryantennessee@yahoo.comandAlbert Iordache 7707864437 TG update: Jetpack changing to wrong sprite when turned on fixed. Syringes will autochange inject/draw when full/empty. Medborg syringes start full and set to inject even though the icon is still messed up. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:05:16 +02:00
ryantennessee@yahoo.comandAlbert Iordache d565fe7a9c TG update: Tracked down the last bottles with limited transfer amounts and made more transfer amounts for them. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2647 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:00:26 +02:00
SkyMarshal fc3914364f Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. 2011-12-18 00:23:02 -07:00
SkyMarshal a0298c0477 Should improve pepper spray a bit. Reduced to 2 shot per Hawkie's request. 2011-12-17 18:37:23 -07:00
SkyMarshal 159ce32cc7 Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg. 2011-12-15 23:58:17 -07:00
SkyMarshal 79ad7d1ae9 Should improve pepper spray, and remove coolness check on detective's revolver 2011-12-15 20:34:36 -07:00
Albert Iordache 9d774ed3c9 Coffee and black tea now gets rid of the slurriness from alcohol. Also added Cib's slur proc. 2011-12-10 22:33:18 +02:00
Albert Iordache e72ae5e8f6 Added a new slurring variable, and set it up in the right places 2011-12-10 14:25:49 +02:00
Albert Iordache 64106be003 Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90 
Lot of tweaks and fixes, read the description.
 2011-12-10 01:43:34 -08:00
SkyMarshal 009d0915bf Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin) 2011-12-08 14:22:45 -07:00
SkyMarshal d7eb6e4ae6 Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker 2011-12-08 12:35:10 -07:00
Miniature af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
 2011-12-07 07:53:20 +10:30
uhangi@gmail.com 44c0cfc46d -Adding pepper spray for security officers. 
-Fixed a storage bug for chemsprayers and space cleaner

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 22:42:18 +00:00
Tastyfish c208332942 added Anchorshag's examination flavor text thingy 2011-12-04 15:26:46 -05:00
uhangi@gmail.com 02132f4ebf Added grenade launcher, one in the armory with the rest of the riot gear. Capable of holding three grenades at a time. Also, one box of flashbangs in Security, another in the firing range, and two extra pairs of glasses (not HUDglasses) in the firing range. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2609 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-04 09:47:19 +00:00
Miniature 2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/vote.dm

Because I did it derpily.
 2011-12-03 19:30:28 +10:30
Miniature f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
 2011-12-03 19:28:10 +10:30
Tastyfish 8c596e5c53 added sleeping on logout, willful sleeping, custom event message, slots 2011-12-02 17:28:24 -05:00
petethegoat@gmail.com a80e46c078 Fixed issue 222. 
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-01 20:02:43 +00:00
Tastyfish 26e1bfdaf1 Added vending charges, removed clown/mime from main joblist, sec belts fixed 2011-11-30 18:34:43 -05:00
ryantennessee@yahoo.com b3bf2edb80 Derped the file names. fixing. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2576 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-29 21:18:54 +00:00
ryantennessee@yahoo.com a728ae8863 Changed medborgs to hold 1 pill each of dexalin, anti-toxin, kelotane, and bicaradine. Added bicardine pill to chemistry tools. Added borg recharging station to medical, security, and janitor closet. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2575 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-29 21:14:37 +00:00
petethegoat@gmail.com 986858f761 Fix for Ripley tele-drilling people that had run away. 
Fix for mediborgs inserting their beaker into the chem dispenser. (this broke everything)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2568 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 19:34:08 +00:00
petethegoat@gmail.com 2190408f0f Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209. 
Slightly improved mops, and got rid of the "X attacks the blood with the mop!" message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2557 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 15:58:50 +00:00
rockdtben 1de1be054d Implemented more getters/setters for damage system. 2 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2556 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 13:33:18 +00:00
vageyenaman@gmail.com d0d3f3bbfd Hopefully fixes mutagen turning cyborgs into humans. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2554 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-25 22:18:09 +00:00