cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-17 19:33:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 15 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

9304 Commits

Author SHA1 Message Date
Asanadas f3d605abe3 De-Culting and you! Null Rods re-receive the ability to de-cult cultists, and a tiny desc change. Holy Water also has the chance to de-cult on metabolism, but less of a chance than the null rod. Holy Water may need some balance adjustments, will watch it in the future. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-27 19:45:40 -04:00
Spamcat 4ad2ce87a6 bleh, removed stray debug thingy 2013-03-24 14:40:15 +04:00
Spamcat 285a1dd89e Arrivals announcement computer strikes back! 
phew, took me long to get rid of it
 2013-03-24 02:20:57 +04:00
Asanadas 0a21e8a4f4 Whoops spelled internal affairs wrong. This pretty much overwrites the lawyer job with an Internal Affairs Agent, made to Cajoes guidelines to the best of my ability. New suit, messed up PDA, and loyalty implanted / answering to the captain to maybe they'll have more pull on the server. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-21 02:59:29 -04:00
Uristqwerty 6a66f542d9 Update from early tubes with bugs, to tubes with less bugs and more features based on feedback. 2013-03-20 18:49:14 -04:00
Spamcat 86cc28dd57 Fixed posibrain installed into spiderbot bug, made posibrains a child class of MMI. 2013-03-19 14:37:21 +04:00
Spamcat 76720abd6f Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging 2013-03-19 11:17:32 +04:00
Spamcat 5e2c921933 Fixed nanopaste messages. 
(and some my shitcode)
 2013-03-18 18:01:51 +04:00
Chinsky 729e187ae6 Merge pull request #2546 from caelaislinn/bleeding-edge-freeze 
Tweaks and such
 2013-03-18 00:15:47 -07:00
Cael_Aislinn dc017d6cce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-18 01:08:45 +10:00
cib 7fbc86da5a Vendors now charge money. 
Swipe your ID card and enter PIN to pay.
 2013-03-17 15:56:43 +01:00
Christian Bielert 14a96f77ab Merge pull request #2539 from comma/organ 
Organ code restructuring
 2013-03-16 07:10:40 -07:00
Cael_Aislinn 42d8cd33e0 made fuel injectors and core gens properly start in mobile configs, made large crates able to hold 1 large item (machinery or structure) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-16 20:58:31 +10:00
Chinsky 97b126b8ab Merge pull request #2516 from caelaislinn/xenoarch 
Xenoarchaeology Update
 2013-03-16 03:10:16 -07:00
cib d1572585d8 Removed crew transfer from comms console. 
Crew transfer is meant to be OOC, not IC.
 2013-03-15 15:53:46 +01:00
Cael_Aislinn 435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:37:35 +10:00
Cael_Aislinn 74d0608278 made research shuttle consoles buildable, removed a debug thing for analysis machines 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:06:22 +10:00
RavingManiac 585fed0005 Intercom canhear_range reverted to 2. 
Intercom in interrogation observation room shifted to cover the whole room.
 2013-03-15 02:19:58 +08:00
Chinsky 38a8246994 Moved code for injecting and taking blood to separate procs. 
Removed special case for blood from regent transferring proc.
Fixed humans spawning as limbles torsos.
 2013-03-14 20:18:37 +04:00
Chinsky a2e2c373ef Added new item - nanopaste. 
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
 2013-03-13 05:57:53 +04:00
Jamini c03465882d Unbolted upload, minor modifications to atmos to make it a little more effeciant and easy to use, returned CE access to the AI core, adjusted the manifest display so Roboticists do not show twice. 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-03-12 17:52:37 -04:00
Chinsky 4f58416332 Merge pull request #2522 from RavingManiac/bleeding-edge-freeze 
Intercom tweaked and notice boards added
 2013-03-11 17:15:11 -07:00
Christian Bielert 817996cd09 Merge pull request #2519 from comma/bleeding-edge-freeze 
Small things and SNEAKING IN TG COMMITS.
 2013-03-11 15:54:24 -07:00
RavingManiac 2d49b05f93 Intercom hear range (that is, the distance at which it can be heard) changed from 2 tiles to 7 tiles, matching the viewing distance. 
Notice boards added to research, security, engineering break room, medbay lobby, HoP's desk, bridge, cargo bay, cargo lobby and mining.
 2013-03-12 03:45:55 +08:00
cib d7714a2459 Fixed a bug with cloning taking meat. 2013-03-11 18:47:16 +01:00
cib ecb08d0c46 Cloning now requires meat for biomass. 2013-03-11 18:20:02 +01:00
Chinsky b207349c44 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:10 +04:00
Chinsky b9abe55aa8 Changed Escape objective a bit. 
Wording now hints at 'fail if in shuttle brig' thing.
Also now needs to have traitor properly cuffed in that area.
 2013-03-11 00:57:31 +04:00
Chinsky b440f14ea6 Removed non-antag chars suicide verb. 2013-03-11 00:38:40 +04:00
Cael_Aislinn f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:01:33 +10:00
Chinsky c45a81789a Merge pull request #2507 from caelaislinn/bleeding-edge-freeze 
Beekeeping
 2013-03-09 05:54:28 -08:00
Cael_Aislinn 06476113fa add the beekeeping manual to hydroponics, add a beenet to the hydro lockers 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:48:31 +10:00
Chinsky cce3e8e4e9 Merge pull request #2503 from CIB/feature 
Improved brainloss effects.
 2013-03-09 05:48:19 -08:00
Cael_Aislinn 56a7441ef5 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 23:46:09 +10:00
Cael_Aislinn 17e607b0d8 compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:45:27 +10:00
Cael_Aislinn 7de4093060 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 23:41:53 +10:00
Cael_Aislinn 86a58380b3 added bees supply pack to cargo bay, made vending machine produce beezeez, make apiaries constructable out of wood 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:39:24 +10:00
Cael_Aislinn b13c634293 added bee stuff, will post documentation for it on the forums. features include: place an apiary on a hydro tray to cultivate bees, bees auto breed and spread (if they have enough food), bees give slight accumulative boosts to nearby plants, bee hives produce honey and honeycomb added manual to explain beekeeping, rampaging bees can do a lot of damage but anything with bio protection will reduce likelihood of being stung 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:38:54 +10:00
cib db707b4e5b Headrevs now get the names of 3 people who might be convertible. 2013-03-09 14:29:48 +01:00
cib bd71f2e25c Fixed advanced med scanner not showing blood % 2013-03-09 11:02:01 +01:00
Spamcat a32639bef4 Returned captain's PDA. 
Fixes #2466.
 2013-03-09 13:59:08 +04:00
cib 55936a3e96 Forgot to save airlock.dm before committing. 2013-03-09 10:40:32 +01:00
cib 58186ce7e0 Improved brainloss effects. 
- Will drop items/fall down with a lot of brainloss now, headache and blurry vision with small brainloss.
- Removed stupid effects, like random messages and headbutting airlocks.
- Cloning now will leave you at lower health and cause small amounts of brainloss.
 2013-03-09 10:35:20 +01:00
Christian Bielert c31abc3b05 Merge pull request #2502 from comma/gunmode 
Aiming Mode
 2013-03-09 00:13:19 -08:00
baloh.matevz@gmail.com 960cd335e6 - Minor bugfix for job feedback gathering. YOUNG did not match the protocol. 
git-svn-id: https://tgstation13.googlecode.com/svn/trunk@5603 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-03-09 07:43:45 +04:00
ericgfwong@hotmail.com 6ac93ddd4d Added new descriptions to each of the rigs and gave them unique armor values. 
Medical PDAs should now have a green stripe

Fixed a misplaced /area/ issue in the Warden's office

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@5602 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-03-09 07:43:04 +04:00
Chinsky 55671d7485 Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/screen1_old.dmi
 2013-03-06 17:04:45 +04:00
Cael_Aislinn ae2b667f38 fixed icon issues with large crates, added a reinforced large secure crate (different aesthetically) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 21:18:15 +10:00
Cael_Aislinn 53793fc2aa Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 19:03:18 +10:00
Cael_Aislinn bb044ded63 added "back" button to go back to last viewed menu for cargo bay computers 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 18:45:38 +10:00