Commit Graph
3161 Commits
Author SHA1 Message Date
CIB fafe55632b Merge pull request #1582 from FireFishie/hat2
Captain's cap is now a hat
2012-08-06 12:52:04 -07: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
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 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
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 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
CIB 9fa25a84ce Merge pull request #1563 from FireFishie/belts
Added some belt storage options
2012-08-03 14:06:13 -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 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
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 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 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 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 f8e0f5a925 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-08-03 15:06:02 +10:00
CIB a1d362b795 Fixed custom votes
The old method of passing the voter as href was still used by custom votes, making Topic() believe anyone doing custom votes was cheating. Thank god there was no auto-ban.
2012-08-03 05:43:39 +03:00
FireFishie a13e620abe Added some belt storage options
-Medical, security, and tool-belts may now hold any type of lighter
-Medical belts may now hold latex gloves and sterile masks
-Security belts may now hold gas masks
-Tool-belts may now hold cigarette packs
2012-08-02 15:26:24 -04:00
Cael_Aislinn e9d68bd249 vermin spawn randomly in maintenance (plus a couple of other areas) at a rate of one every 10-15 mins.
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-02 15:39:00 +10:00
Cael_Aislinn 3c168305ed reworked equip_if_possible to be a bit better 2012-08-02 14:33:00 +10:00
Cael_Aislinn 7ae269f38f some tweaks to mice and roaches, tried to get the gameticker to periodically spawn them but failed (will come back to)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-02 04:56:48 +10:00
Cael_Aislinn 469a8bb601 ported over the majority of /tg's simple_animal code and changed a lot of things for simple_animals and critters
- added bears, mice (cats will chase mice, mice squeak occasionally)
- removed some unique simple_animals (ian and runtime will be the only ones for now)
- structure improvements, tweaks and cleanup for simple_animals and critters
- space carp should work fine now
2012-08-02 03:22:44 +10:00
CIB e9937050aa Merge pull request #1558 from FireFishie/closets
Some minor changes, mostly related to wardrobes and fluff text
2012-08-01 00:23:05 -07:00
FireFishie fae6f2eecd "Space Law" on the wiki is always capitalized, so now it should be in-game too. 2012-07-31 04:45:07 -04:00
FireFishie 60c962ebb8 Clipboard added to the head of personnel's wardrobes and starting items. If the quartermaster has a clipboard on him and in his wardrobe bag, then his boss should too. 2012-07-31 04:36:32 -04:00
FireFishie eac1335607 Added the warden jacket and pepperspray to the warden's wardrobe, and added fingerless gloves to the cargo technician and shaft miner wardrobes.
The janitor spawns with a portalathe but doesn't have one in his wardrobe, so this adds that. If the librarian gets a barcode scanner in his, then the janitor's should include the portalathe.

The captain has taken a few lessons from the head of security! When joining, the captain will now start with matching gloves, a pair of jackboots, and the more sensible captain's cap. The old Napoleonic hat is still available in the captain's closet, and both the closets and wardrobes were updated to reflect this change.

The quartermaster started with brown shoes, but only had black ones available in his wardrobes. This change should make his starting equipment more consistent.

The head of personnel should no longer be so paranoid, and now spawns without wearing body armor or a helmet. Additionally, the body armor and helmet from the wardrobe closet and bag were removed. A gun, helmet, and body armor are still available in the secure locker for emergencies.

The breath mask inside the engineer box included with the ERT backpack looked terrible when worn with the ERT helmet, yet was required if any of the team were operating near a breach or anything. This change only returns the removed SWAT mask (which leaves the helmet sprite intact) to the response team's basic equipment.

Both the secure closet and the wardrobe bag have the medsci headset in it, and the chemist lab is conjoined with research, so why shouldn't the chemist start with that headset? This commit also moves the chemist to Medical on the roster because that's where the job shows up everywhere else.
2012-07-31 01:21:44 -04:00
FireFishie 8c7592fa00 Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages. 2012-07-31 01:14:14 -04:00
Nerezza b6d6dc2574 modified: code/game/jobs/job/engineering.dm
modified:   code/game/objects/closets/wardrobe.dm
2012-07-30 13:09:52 -05:00
Nerezza d8dfc36ec0 Update code/game/mecha/mecha.dm 2012-07-29 23:37:20 -05:00
Mloc ba370735ff NULL checks.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-07-29 18:34:12 +01:00
Cael_Aislinn c296286e52 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-30 01:26:10 +10:00
Albert Iordache 4f5bdc6c64 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-29 15:50:44 +03:00
Albert Iordache 8a340237c6 Merge branch 'master' of https://github.com/comma/Baystation12 into comma-master
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
2012-07-29 15:49:56 +03:00
comma b2522daa5d Surgery bugs.
Stopped attacking patient during head surgery with hemostat.
Was caused by try_bone_surgery called twice in code.
Removed one redunant call.

Fixed runtimes during face surgery.
Null organ was caused by not being 'mouth' organ there.
Made it select 'head' as affected organ.
2012-07-29 08:21:37 +04:00
TurboCamel 005b5ec1e5 Added new circuit boxes
Added power control module box and airlock electronics box.
2012-07-28 16:37:17 -05:00
Cael_Aislinn 1ecbc5c950 modified lockdown computer and blast doors / shutters on antiqua and exodus, now has increased usability etc.
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-29 03:28:50 +10:00
CIB 2d333b743c Merge pull request #1532 from headswe/master
Firedoors are now "emergency shutters" and have a new sprite.
2012-07-28 09:33:13 -07:00
Head ee6c81dc47 Firedoors are now "emergency shutters" and have a new sprite. 2012-07-28 18:30:57 +02:00
CIB cae467ce39 Merge pull request #1531 from headswe/master
Fixes a few runtime errors
2012-07-28 08:55:22 -07:00
Head f814d99249 Added condition to the rest of the code in effect_system.dm 2012-07-28 17:53:13 +02:00
Head 04fac7a528 Fix for the fix!, God i hate byond code. 2012-07-28 17:46:25 +02:00
Head 3a1f30ece4 A few fixes. 2012-07-28 17:16:22 +02:00
Albert Iordache 3cf5cb0d3d Merge pull request #1522 from caelaislinn/powerchanges
powerchanges
2012-07-28 00:23:27 -07:00
SkyMarshal 62dcb7be1b Adds caching to dummy objects, seems to work great. 2012-07-26 17:14:31 -07:00
SkyMarshal 54ce48fb9d Connections no longer are deleted when a door closes, instead persisting until merged or a wall is built there or something. Better runtime detection, and no more searching through world for fires to process. 2012-07-26 15:33:21 -07:00