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
Cael_Aislinn
8cd47739d2
removed event debug string, bumped up minimum event interval, tweak to space carp
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-19 14:04:33 +10:00
Gamerofthegame
437cca538b
Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze
2013-02-18 00:07:40 -05:00
Cael_Aislinn
24763f8bb0
removed debug output, cleanup of alien languages, bumped tajaran darkseeing
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-18 13:07:01 +10:00
Cael_Aislinn
2b4827692c
tweakfixes to admin PMs
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-18 13:06:07 +10:00
Gamerofthegame
64c72ef969
Adds the ERT to the debug command for adminnery. Not exactly like the pre-merge one, as that was based off something else so I couldn't copy-paste. It should give admins a easier time of making things up, though, and so long as future plans go into effect a admin ought to be able to do it on the fly in less then a minute.
2013-02-17 18:15:07 -05:00
Cael_Aislinn
fea6635060
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
code/game/verbs/who.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-18 01:25:47 +10:00
Cael_Aislinn
da9b87a288
beepsky now fights hostile NPC mobs, and vice versa
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-18 00:32:49 +10:00
Chinsky
948e859d80
Fixes #2343 (and #2342 ), #2356 Readded pre-merge bottle and pill icon choosing system.
2013-02-17 18:31:03 +04:00
Chinsky
0cb4e29a4a
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-02-17 17:51:09 +04:00
Chinsky
a68e5d3875
Merge pull request #2333 from Baystation12/BEF-staging
...
Merge on the 16th if no issues
2013-02-17 04:44:25 -08:00
Cael_Aislinn
4b69afd15b
made carp migration actually end (carp disappear back into the void)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-17 11:17:45 +10:00
Chinsky
7a94494eee
Merge pull request #2354 from Zuhayr/master
...
Posibrain fixes (double name, protolathe, double binary)
2013-02-16 02:22:47 -08:00
Zuhayr
4dd7141e32
Removing a debug string.
2013-02-16 16:19:39 -08:00
Zuhayr
6ad09d49c8
Fixes for posibrain name generation, research design for protolathe, possible for for double-say for posibrains (cannot test locally).
2013-02-16 14:21:00 -08:00
Chinsky
8b8556a1b1
Removed requirements for face surgery to cut open head too, real counterintuitive and looks like copypaste error >.>
2013-02-15 02:06:35 +04:00
cib
c5301c5144
Fixes issue #2296 : Humans will not react to sleep toxins in smaller amounts than can be scrubbed.
2013-02-14 15:06:10 +01:00
cib
5217227f9a
Fixes issue #2309 : Infected blood now infects again.
2013-02-14 14:45:52 +01:00
Cael_Aislinn
ff222c2f13
fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-14 23:17:54 +10:00
Cael_Aislinn
d1e6e342c5
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-02-14 22:10:02 +10:00
cib
4c49e51182
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into BEF
2013-02-14 13:05:27 +01:00
Cael_Aislinn
49e4eaeffb
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-14 22:02:06 +10:00
RavingManiac
4eca9b143e
Player-controlled mice spawn next to a vent by default, spawn at MOB_LAYER, can nibble food to regain health, can pass through plastic flaps, and can climb into disposal units.
...
Mice cannot pull objects.
2013-02-14 16:15:20 +08:00
Cael_Aislinn
431002cb30
reduced drone damage + increased health, halved explosion damage (approx) + made exploding more obvious, reduced max drone tech bonus to 6, bit of cleanup in the AI
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-14 14:58:15 +10:00
cib
a9c13cdf37
Merge branch 'master' of github.com:Baystation12/Baystation12 into BEF-staging
2013-02-13 20:13:04 +01:00
Erthilo
ed76409141
Fixes mice emotes and Set-Pose verb periods.
2013-02-13 17:10:19 +00:00
Erthilo
e5fcb91fb0
Fixes SSD not being prolonged.
...
Signed-off-by: Erthilo <erthilo@gmail.com >
2013-02-13 10:35:09 +00:00
Cael_Aislinn
d89c4e744f
renamed a file, added rogue drones random event (laser drones spawn and fly around the map, teleport out after a while), added infestation random event (lizards, mice, slimes spawn on the map in some rooms)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 17:50:57 +10:00
Cael_Aislinn
e6e4b89819
disabled simultaneous admin PM warning
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 17:49:48 +10:00
Cael_Aislinn
7cc207583a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
baystation12.dme
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 12:30:01 +10:00
Cael_Aislinn
dd822cc985
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-02-13 12:26:01 +10:00
cib
31cd43945d
Added various new side effects:
...
- Headache triggered by bicaridine, alkysine and cryoxadone, treated with tramadol or alkysine
- Cramps triggered by bandages and ointment, treated with inaprovaline
- Bad stomach, triggered by dermaline, kelatone or being cloned, treated with anti-toxin
2013-02-12 18:20:57 +01:00
cib
1ed5c7ec37
Previously your nanotrasen loyalty setting wouldn't save.
2013-02-12 16:57:33 +01:00
cib
62c906cd30
Merge branch 'feature' of github.com:CIB/Baystation12 into feature
2013-02-12 16:20:50 +01:00
cib
1648c69f9d
Implemented medical side-effects.
2013-02-12 16:19:39 +01:00
cib
c6f40e3a6d
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
2013-02-12 13:32:39 +01:00
RavingManiac
83d7031728
Revert "Traitor's revolver is now w_class=2.0 (pocketable). Sprite is now that of a snub-nosed revolver."
...
This reverts commit b600b54f61 .
2013-02-12 17:43:28 +08:00
RavingManiac
4f8a8ed0cf
Allows mice to pass over/under tables.
2013-02-12 17:35:15 +08:00
RavingManiac
d8269c0834
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
ow that of a snub-nosed revolver."
This reverts commit b600b54f61 .
2013-02-12 02:53:23 +08:00
Zuhayr
b97890b896
Icons and code for an NT-knockoff soghun space suit.
2013-02-11 19:23:23 -08:00
Zuhayr
5c8aa6b6f9
Merge resolution.
2013-02-11 16:41:32 -08:00
cib
f424a2c4c0
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
...
Conflicts:
baystation12.dme
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
2013-02-10 23:07:55 +01:00
cib
dd4949bc62
Merge branch 'master' into feature
2013-02-10 22:58:32 +01:00
cib
104d21e9e2
Simple animal balance fixes:
...
- Reduced the speed of most simple animals to 4, so now you can get away if you're fast and they don't shoot you
- Added a mechanic that determines how likely a hostile animal is to smash in a window, and made this chance very low for carp
- Simple animals will no longer attack people in crit
2013-02-10 22:56:40 +01:00
Chinsky
d23d56cb70
Merge pull request #2306 from CIB/master
...
Cleanly amputated limbs should not bleed.
2013-02-10 11:45:27 -08:00
cib
aa753a7f3c
Cleanly amputated limbs should not bleed.
2013-02-10 20:43:32 +01:00
Cael_Aislinn
eb02fb3636
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
baystation12.dme
code/modules/events/event_manager.dm
code/modules/events/ion_storm.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-11 02:56:07 +10:00
Cael_Aislinn
f29c19e52c
added global PM visibility for mods
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-11 02:51:55 +10:00
Cael_Aislinn
0dde35b385
unique voice text colour for soghun, skrell and taj
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 22:36:23 +10:00
Cael_Aislinn
28b5096ab3
players can choose the bottle icon of new pill bottles, forgot to save map
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:55:40 +10:00