Commit Graph

5338 Commits

Author SHA1 Message Date
Cael_Aislinn
efd586a9e1 added large metal crates (secure and normal variants) to be resprites of normal crates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:32:28 +10:00
Cael_Aislinn
92517638bc removed double announcement for grid checks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:31:40 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 17:23:16 +10:00
Cael_Aislinn
950c5a84ab updated roundstart music
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 17:15:12 +10:00
cib
aa4deb2b89 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2013-03-04 12:20:38 +01:00
cib
65b8eafe8e Added internal organs.
They can be hurt by their parent organ getting hurt.

Ruptured lungs are now represented as damage to the lungs internal organ.
2013-03-04 12:19:12 +01:00
Zuhayr
cbc62505e7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-03-04 01:52:12 -08:00
cib
997c1e63ad Fix for too many changelings. 2013-03-02 19:59:16 +01:00
Zuhayr
3774b16839 Made spiderbots buildable, animated spiderbot sprites. 2013-03-02 02:15:39 -08:00
cib
0876d6f913 Added extra safety check. 2013-02-27 02:48:49 +01:00
cib
26b4deb33f Department accounts are created now and credentials given to heads. 2013-02-27 01:55:18 +01:00
Christian Bielert
80b9257332 Merge pull request #2446 from Baystation12/BEF-staging
Bef staging
2013-02-25 09:58:25 -08:00
Cael_Aislinn
02ace92b04 miscellaneous tweaks to finance machines
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-26 02:59:04 +10:00
Chinsky
97b547d5d3 Merge pull request #2440 from Zuhayr/master
Robot changes, Set Flavour verb.
2013-02-25 01:19:08 -08:00
Zuhayr
2381aa2dca Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain. 2013-02-25 19:48:00 -08:00
Cael_Aislinn
09dc10810f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-25 14:02:55 +10:00
Cael_Aislinn
fed198964f fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.>
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 13:45:13 +10:00
Cael_Aislinn
a77a409a78 tweaks to finances (added feedback to atms, made accounts synced to station account db at round start)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 13:44:35 +10:00
Chinsky
83fdf57540 Merge branch 'feature' of https://github.com/CIB/Baystation12 into cibderp
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2013-02-24 20:29:59 +04:00
Cael_Aislinn
b36a9565a6 bumped turret noise prob
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 22:21:35 +10:00
Cael_Aislinn
a8c2745398 cut back cached music to 2 tracks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 22:10:53 +10:00
Cael_Aislinn
3cc31685c0 fixed round start/late arrival account creation for players, made eftpos scanners orderable via QM
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 21:51:56 +10:00
Cael_Aislinn
ec023cc3f8 tweaks to finances (inc boost to wallet capacity, new sprite for eftpos)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 21:51:29 +10:00
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
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
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
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
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
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
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
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
b1272bb987 Merge pull request #2378 from caelaislinn/master
Remove debug string
2013-02-20 03:02:34 -08:00
Cael_Aislinn
93ef7b83d8 replaced infestation slimes with spiderlings (with 0% chance to grow into giant spiders), reduced spiderling noisiness, made them less jittery (easier to squish)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-20 20:56:09 +10:00
Chinsky
fa1d81fbae Fixed derp.
Compile errors because I am retarded.
2013-02-20 10:38:36 +04:00
Chinsky
10ba1e5e6c Merge pull request #2386 from Uristqwerty/master
Non-animated runes not cached.
2013-02-19 21:21:35 -08:00
Chinsky
28c8c67946 Fixes issue #2384 Uplink now spawns proper implanters. Fixed missing icon for compressed matter implant. 2013-02-20 09:20:32 +04:00
Chinsky
df67151fe3 Merge branch 'master' into bleeding-edge-freeze 2013-02-20 09:18:14 +04:00
Chinsky
41f09299c9 Compressed implant item now will be put in hands instead of the floor. 2013-02-20 09:17:41 +04:00
Chinsky
eb03e35296 Fixes issue #2384
Uplink now spawns proper implanters.
Fixed missing icon for compressed matter implant.
2013-02-20 09:15:27 +04:00
Chinsky
65d79e6ec1 Fixed runtime in traitor equip. 2013-02-20 08:58:09 +04:00
Uristqwerty
29f1095a25 Non-animated runes aren't being cached, probably a bug. 2013-02-19 23:40:06 -05:00
Chinsky
b12594f561 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-19 21:38:26 +04:00
Chinsky
0eca1bd4e4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-19 18:46:29 +04:00