Commit Graph

9543 Commits

Author SHA1 Message Date
Cael_Aislinn
9c0fb003ac some new [old] sound effects, turrets make ambient noise occasionally, bit more roundstart music, some more ambient music for areas
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 21:48:48 +10:00
Cael_Aislinn
1469ccb7f9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-23 19:39:05 +10:00
Cael_Aislinn
68abeda762 when players arrive, they are assigned a new account with random starting funds and the info for it is stored in their memory + ID card. id computer can now modify the account number associated with id cards
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 19:38:50 +10:00
Cael_Aislinn
cfa317a664 added [old] roundstart music, cleaned up folders a bit
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 18:54:01 +10:00
cib
b98eedeadf Added psychiatrist job and anti-depressants. 2013-02-23 05:36:04 +01:00
Chinsky
5d6cc21716 Merge pull request #2412 from CIB/feature
Removed double definition.
2013-02-22 16:38:27 -08:00
Chinsky
fd2f37428b Made limb surgery not EXPLODE robotic limbs 2013-02-23 03:58:32 +04:00
Chinsky
1aafb9ade9 Derp, forgot the surgery. 2013-02-23 02:30:01 +04:00
cib
8639d00a9d Removed double definition. 2013-02-22 23:13:22 +01:00
Chinsky
3b95009189 Commented out debug verb just in case.
Does not really affect anything, but may get a bit resource heavy if spammed.
2013-02-23 00:45:54 +04:00
Chinsky
29b1ef1c63 Derp, forgot main part of explosive implant EMP code and changelog. 2013-02-23 00:41:20 +04:00
Chinsky
039de3df1a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-23 00:12:26 +04:00
Chinsky
5ab07cc64f Merge pull request #2406 from CIB/feature
Cryo now only injects as much chemicals as necessary.
2013-02-22 12:10:46 -08:00
Chinsky
170c90b511 Merge pull request #2407 from caelaislinn/bleeding-edge-freeze
fixed compile error
2013-02-22 12:09:59 -08:00
Chinsky
b208a953d0 Made EMP less instarape switch for Nuke Team.
Instead of 50% chance to go off, it goes like that
30% Nothing happens
70% Malfunction:
    50% Tear off limb / big wound
    50% Bad malfunction:
      50% BOOM
      50% meltdown, won't activate ever

Which takes it from 50% to 17.5%
2013-02-23 00:09:05 +04:00
Chinsky
2ce64b77a7 Merge branch 'necrosis' into bleeding-edge-freeze 2013-02-22 23:46:54 +04:00
Chinsky
1d1cea12ad Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/events/infestation.dm
2013-02-22 23:46:41 +04:00
Chinsky
83eb9cac83 Commented out gangrene for now.
I suck at branches, it got caught with my surgery fixes.
2013-02-22 23:24:33 +04:00
Chinsky
a8fdc16729 Debug verb to check how long it would take for gangrene to kick in. 2013-02-22 23:13:22 +04:00
Chinsky
f50fd49032 Gangrene!
Now germ level for organ has three thresholds.
LEVEL 1: Occasional (prob(10) every tick) tox damage and germ level raise.
LEVEL 2: In addition to that, tox damage and germ level raise every tick.
LEVEL 3: Limb necrosis. Currently does nothing but icon change. Also at this stage germs start leaking to connected organs, so amputations is necessary.
2013-02-22 23:12:27 +04:00
Chinsky
e8f8138e04 Added priority system for surgery steps.
Steps with higher priority would be attempted first.

Added preparation step for item insertion surgery.
2013-02-22 23:06:37 +04:00
Cael_Aislinn
a5a8caeb00 fixed compile error
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 02:30:32 +10:00
cib
e4264bb014 Cryo now only injects as much chemicals as necessary.
Fixes the problem of people who were in cryo getting headaches forever.
2013-02-22 17:01:41 +01:00
Christian Bielert
4b7f5c817c Merge pull request #2403 from caelaislinn/bleeding-edge-freeze
Miscellaneous minor things
2013-02-22 07:38:39 -08:00
Cael_Aislinn
3c3d19ade8 added missing config links, added holder rights check to hearing deadchat
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 01:31:52 +10:00
Cael_Aislinn
59c96782d0 fixed up some derps with admin ooc colour
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 01:18:55 +10:00
Chinsky
cc3d49cf4b Merge pull request #2401 from caelaislinn/bleeding-edge-freeze
RUST updates, event tweaks, shielding updates
2013-02-22 07:05:11 -08:00
Cael_Aislinn
43e58aacbb new unathi hair styles
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 00:46:33 +10:00
Cael_Aislinn
389be7d4cf NPC mice periodically fall asleep
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 00:45:48 +10:00
cib
bfd02c3474 Chemical rebalance across the board.
- Halved metabolism in general. This is not a huge change, and will probably work out fine.
- Nerfed metabolism for individual chemicals, for example spaceacillin, greatly.
- Made mildly toxic chemicals, like pure carbon, cause medical side-effects.
2013-02-22 15:08:42 +01:00
Cael_Aislinn
306cffb46c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/events/event_manager.dm
	code/modules/events/infestation.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 23:59:38 +10:00
Cael_Aislinn
8ee5672159 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-22 23:56:38 +10:00
Cael_Aislinn
2c585fbcc4 moved shield files to folder, made circuitry for shielding gens/caps researchable, various tweaks and balances to the research requirements, made shield gens/capacitors orderable via cargo
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 23:49:29 +10:00
cib
961c77e26e Medical side-effects now appear on overdose.
Also reduced anti-toxins pill amount, because 50 units is way too much for a single pill.
2013-02-22 14:28:55 +01:00
Cael_Aislinn
bdf1589cc2 made rogue vending machines revert after event end, reduced chance of machines going rogue
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 22:42:25 +10:00
Cael_Aislinn
4052e98723 made circuitboards for fuel injectors and rust core, made said circuits researchable, miscellaneous tweaks and cleanups
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 22:41:59 +10:00
cib
947d69be69 Removes random side-effects being caused by most medicine.
Cryo and cloning will still cause it.
2013-02-22 13:33:49 +01:00
Cael_Aislinn
66b04ccf1d made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 20:00:05 +10:00
Cael_Aislinn
7f9c95526d consolidated icons
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 19:51:28 +10:00
Cael_Aislinn
d477b7230f reworked rust components to integrate more smoothly with each other, cleaned up a bunch of useability issues, made all relevant components portable, fixed some random bugs, added a mostly nonfunctional map to show an example layout (based on antiqua's engineering layout)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 16:39:42 +10:00
Chinsky
a1a29e76a7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/events/infestation.dm
2013-02-21 12:00:33 +04:00
Albert Iordache
b78c942f35 Merge pull request #2392 from CIB/master
Fixes random events
2013-02-20 15:13:03 -08:00
cib
35bf0648ae Fixes events being broken.
The proc to get active playercounts was utterly broken, which led to there only being events that needed no specific requirements. Fixed, and made events more common(the only reason people were pissed about so many events was that only the annoying ones would spawn ever).
2013-02-20 23:05:48 +01:00
Christian Bielert
f2b9816810 Merge pull request #2389 from comma/bleeding-edge-freeze
Guns, medicine and fixes.
2013-02-20 13:22:57 -08:00
Christian Bielert
ec54b0501e Merge pull request #2390 from Uristqwerty/master
Fixed infinite loop in powernet rebuild. (Issue #2385)
2013-02-20 13:18:21 -08:00
Uristqwerty
b1c20c32d7 Fixed infinite loop in powernet rebuild.
If a /obj/machinery/power wasn't anchored, it wouldn't get a new list of connections, so would endlessly loop on the old list, of which that object was the first entry, ensuring that the loop would never terminate.
2013-02-20 14:47:32 -05:00
Christian Bielert
d43b798474 Merge pull request #2387 from comma/master
Fixes issue #2384
2013-02-20 10:54:04 -08:00
Chinsky
6015df7178 Tweaks to side effects.
Removed itch one. Caused lots of whining, since it's quite counterintuitive to take drugs to treat itch instead of scratching it or removing bandage.
Made side effects contracting probability-based, probability higher the stronger chemical is.
2013-02-20 20:00:01 +04:00
Chinsky
4e35fccdb7 Fixed issue with laser beams freezing forever in case they missed the mob. 2013-02-20 19:30:13 +04:00
Chinsky
b649ab5a44 Fixes projectiles still applying effects even if they missed. 2013-02-20 17:33:48 +04:00