Commit Graph

5207 Commits

Author SHA1 Message Date
CIB 791e481d6e Removed a lagtastrous item 2012-08-06 14:12:04 -07:00
CIB fafe55632b Merge pull request #1582 from FireFishie/hat2
Captain's cap is now a hat
2012-08-06 12:52:04 -07:00
Cael_Aislinn f52eb099f7 tweaks, fixes and additions to carp and simple_animals
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-07 00:03:56 +10:00
FireFishie 9b4cdb357e Captain's cap is now a hat
-Traded the Captain's cap back for the hat, as the cap is actually not all that sensible
2012-08-06 06:50:31 -04:00
Cael_Aislinn bc58cbe6a3 fix for announcement bug
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 17:21:46 +10:00
Cael_Aislinn 3e6f253cb7 various tweaks to energy fields, energy field artifacts (some outstanding bugs still)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 05:13:02 +10:00
Cael_Aislinn 136b8e44e3 oops
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 00:17:05 +10:00
Cael_Aislinn d7bd58b8f3 roach remains have a bit more substance now
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 21:47:03 +10:00
Cael_Aislinn 52fdda910a mice can crawl through vents and hide under objects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 21:03:16 +10:00
Cael_Aislinn bece31d819 fix for mouseception naming bug
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 20:00:43 +10:00
Albert Iordache 27920a6c59 Merge branch 'mechrevert' of https://github.com/Nerezza/Baystation12 into Nerezza-mechrevert
Conflicts:
	code/game/mecha/mecha.dm
2012-08-04 22:48:25 +03:00
Cael_Aislinn eaa28099d3 compile fixes, more tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 03:52:17 +10:00
Cael_Aislinn 2b2017126a tweaks to simple_animals, carps no longer freeze / require oxy to live (but rapidly burn up from 25+ degree temp), kobolds no longer require oxy to live
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 03:13:49 +10:00
Cael_Aislinn 321e8e9e21 uncommented some missing supply datums
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 02:21:45 +10:00
Albert Iordache 0fd0f5dbf0 Merge pull request #1571 from caelaislinn/master
compile fixes
2012-08-04 04:03:01 -07:00
Albert Iordache e685276c91 Merge pull request #1569 from FireFishie/map3
Minor map changes and a changelog
2012-08-04 04:00:04 -07:00
Cael_Aislinn 6d0058a31e fix for contraband >.>, also simple_animals can't buckle themselves in now
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 20:58:53 +10:00
Cael_Aislinn 8d4f6a8efe admins can change the serial number of a rolled up poster to change the poster decal type when applied. note that you'll need to change the name of the rolled up poster to reflect this if you want to avoid confusion
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 20:00:59 +10:00
CIB 429b04149a Merge pull request #1570 from caelaislinn/master
various simple_animal tweaks, fixes and improvements
2012-08-04 02:48:55 -07:00
CIB e0c67241cf Added cyborg to jobbans for security etc. 2012-08-04 12:41:50 +03:00
Cael_Aislinn 93f864083c doubled zas debug sensitivity, some tweaks to mouse/ghost spawning
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 19:23:40 +10:00
Cael_Aislinn 2cb704f617 tweaks and fixes to a couple of supply crates
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 16:23:23 +10:00
Cael_Aislinn 714a9b120f compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 15:56:18 +10:00
Cael_Aislinn 46a450069e - simple_animals can't open doors by default
- alien larvae, mice can hide under mobs
- roaches, mice can hide under various objects
- various tweaks, including flavour and existing mechanics
- fix for ghosts not being able to spawn as mice
- added move delay of half a second to simple_animals (about the same as human walkspeed?)
- simple_animals, when talking, can only understand each other (and mobs with universal_speak)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 15:47:56 +10:00
Cael_Aislinn 0b14f97af0 hardcap for vermin spawning (30, editable via gameticker) 2012-08-04 15:44:02 +10:00
Cael_Aislinn c4ba455f35 added var to /mob to allow some mobs to share spaces
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 13:12:17 +10:00
FireFishie 01765aa13d Changed name of Warden to Warden's Office
-This resolves issue 1490
2012-08-03 21:55:22 -04:00
Mloc 35ac90da8f Merge pull request #1568 from SkyMarshal/BugFixes
Runtime fix
2012-08-03 14:09:42 -07:00
SkyMarshal 55adee1723 Runtime fix 2012-08-03 14:08:07 -07:00
CIB 9fa25a84ce Merge pull request #1563 from FireFishie/belts
Added some belt storage options
2012-08-03 14:06:13 -07:00
Mloc aba1c4d12a Merge pull request #1567 from caelaislinn/master
ghosts can become mice at will
2012-08-03 12:00:54 -07:00
Cael_Aislinn 4a460f24f3 compile fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 04:07:54 +10:00
Cael_Aislinn 08f47799e1 ghosts/observers can possess mice at will 2012-08-04 03:57:16 +10:00
Cael_Aislinn 2f634cc081 limit vermin to 30 (can be edited in the gameticker)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 03:53:28 +10:00
Cael_Aislinn 7401f53d75 tweaks to vermin spawning
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 03:41:59 +10:00
SkyMarshal e4c4f77de2 Fix for the runtime Mloc sent me. 2012-08-03 10:40:54 -07:00
Cael_Aislinn 388d0b9be0 some tweaks to vermin spawning
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 02:06:26 +10:00
Cael_Aislinn 6e0046c77d players who died while in control of simple_animals should now have their name display properly
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 01:42:48 +10:00
Cael_Aislinn 223cee4aa3 fix for non-working shutters and blast doors on exodus and antiqua
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 01:42:03 +10:00
Cael_Aislinn fd7ddfa11a removed all kobold speak messages
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 00:28:48 +10:00
Cael_Aislinn c87bb36e90 missing icon file
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-04 00:15:37 +10:00
Cael_Aislinn e695bf3ed1 removed hanging simple_make options
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 20:27:33 +10:00
Cael_Aislinn 3f4d2500f6 holding exact required credits will now bring success
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 20:25:09 +10:00
Cael_Aislinn 1c2bb7e750 fixes to vermin spawning, replaced rag spawners in map with actual rags
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 20:21:43 +10:00
Cael_Aislinn d8782639da replaced adv first aid in medical supply crates, upped cost to 20
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 20:11:56 +10:00
Cael_Aislinn d734754763 emergency supplies are a bit more cost-effective
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 20:07:13 +10:00
Cael_Aislinn d20a7a50f1 compile fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 19:56:45 +10:00
Cael_Aislinn 7fce61598a new traitor objective to steal money
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 19:49:01 +10:00
Cael_Aislinn baac6fe04c fix for kobold doing stuff while dead
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 19:17:34 +10:00
Cael_Aislinn 6caa6c62cc remove adv first aid kit from medical crates and upped cost to 15, upped cost of electrical crates to 20, increased cost of all engine crates at 10 to 15
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-03 15:17:24 +10:00