Commit Graph

2756 Commits

Author SHA1 Message Date
Chinsky
69c32e1e61 Merge branch 'bleeding-edge-freeze' into gun 2013-02-20 10:22:12 +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
Chinsky
261577317e Merge pull request #2373 from CIB/master
Several bugfixes
2013-02-19 06:44:05 -08:00
RavingManiac
839d4cb6c8 Added var/small to mobs, which currently only handles if they can open airlocks. This replaces the use of ismouse(). 2013-02-19 22:10:27 +08:00
RavingManiac
254b5cccd4 Some uses of ismouse() replaced with isanimal()
world.time used to calculate mouse spawn timer.

Spawn timer now applies to being killed via splat().
2013-02-19 19:22:00 +08:00
RavingManiac
b2b2894e3b Players have to wait 5 minutes between dying as a mouse and respawning as a mouse. Global variable mouse_respawn_time determines the respawn time in minutes.
Mice can no longer open airlocks.

Mice can no longer strip items from humans

Mice can no longer put other creatures into disposal units (though they can still climb into disposal units)

Message for when mice crawl into vents removed. Mouse nibbling message only displayed to observers half the time.
2013-02-19 08:04:53 +08:00
cib
18a552af0a Fixed problem where hostile animals would attack even the dead. 2013-02-18 23:35:51 +01:00
cib
0e70040810 Fix to issue #2371
Increased the simple_animal/hostile/move_to_delay, which seems to be an entirely separate value for speed. This code is so messed up.
2013-02-18 23:30:20 +01:00
cib
3df671f8d0 Attempt to fix issue #2371
- Halves drone speed
- Copied over the exact values from space-carp for spaceproofness, though it should already have worked before
- Untested(whooo uni)
2013-02-18 22:52:41 +01:00
Christian Bielert
9881020742 Merge pull request #2370 from comma/surgery
Sticking it in people
2013-02-18 13:40:44 -08: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
Chinsky
4a1198bfe4 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-02-18 00:11:51 +04: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
Chinsky
92c8c34c2a Removed getDisplayNameProc(), since all organs have display_name var anyway.
Moved some severed head code into it's New() for readability.

Fixed noexplode flag in droplimb still making limb give explosion message.
2013-02-17 19:12:00 +04: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
a68e5d3875 Merge pull request #2333 from Baystation12/BEF-staging
Merge on the 16th if no issues
2013-02-17 04:44:25 -08:00
Chinsky
9c43050ba7 Change to check_zone proc.
It makes possible to target hands/feet/groin.
Not sure what side effects would this change have.
2013-02-16 19:01:48 +04:00
Chinsky
764fa03a17 Fix for negative miss chance modificators working. 2013-02-16 18:58:43 +04: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
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
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
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
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
RavingManiac
4f8a8ed0cf Allows mice to pass over/under tables. 2013-02-12 17:35:15 +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
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
cib
aa753a7f3c Cleanly amputated limbs should not bleed. 2013-02-10 20:43:32 +01: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
6443eeaa7a made carp and giant spiders not carve sections out of the station, removed meese's universal speak
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-10 21:23:37 +10:00
Cael_Aislinn
f6d3114d6e mice no longer have universal speak, carp and giant spiders will no longer carve through the station, removed unused item
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-09 01:13:30 +10:00
Chinsky
4dd238107b Added lung fixing and disease curing things to adminrevive. 2013-02-07 21:47:24 +04:00
Chinsky
4d7aa320cb Due to git tree being fucked up for some reason, manually reapplied many man many fixes.
Just got to tip of real tree and got zipball, then unpacked it here.
2013-02-07 07:13:27 +04:00
Hawk-v3
1117db050d Merge pull request #2271 from comma/master
Fixes Take Three
2013-02-06 15:47:14 -08:00
Chinsky
5fdd6462a1 Merge pull request #2265 from Gamerofthegame/bleeding-edge-freeze
Map fixes
2013-02-06 13:54:31 -08:00
Chinsky
8396c9fb3f Fixed double definition of ethanol.
Fixed issue with emotes being slurred up.
2013-02-06 21:38:21 +04:00
Chinsky
f114cdaf01 Fixed burn damage treated as brute one for organs. 2013-02-06 19:29:05 +04:00
Chinsky
1e44b47b83 No, monkeys do not have organs, stop lying. 2013-02-06 19:19:38 +04:00
Zuhayr
027955d3d2 Fixed invisible Ripley bug, added line of fluff to posibrain join message, reduced posibrain requirements. 2013-02-06 04:07:32 -08:00