Commit Graph

532 Commits

Author SHA1 Message Date
comma ef6473b964 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Now working
And without promoting myself as Game Master :P

Signed-off-by: comma <krauchinsky@gmail.com>
2012-03-03 03:16:30 +02:00
Albert Iordache 0fe9ef55c2 Merge pull request #586 from CIB/master
Some enhancements to the monkey AI
2012-03-02 12:25:46 -08:00
comma ee09389f5b Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-02 22:04:20 +02:00
comma 2edd73627d Added ashtrays
Breakable. Spill contents on breaking or hitting the solid stuff after being thrown.
Have limited capacity. Can be emptied in disposal outlet.
Change sprite when are half-filled and filled.
Also fiddled a bit with the cigs code, so you can put them out without dropping.
2012-03-02 21:56:08 +02:00
Ren Erthilo 79501f3111 Changed AI laws to use crew instead of human. Left Asimov unchanged. Added more Ion Storms laws. 2012-03-02 18:25:28 +00:00
cib e0a919be43 Monkeys now react to being attacked by doing emotes and trying to run away. 2012-03-01 16:03:55 -08:00
Hawk-v3 bbc12c6713 Subject: [PATCH 084/285] TG Updates: Cyborgs now get a message that their parent AI has had their laws modified. (For Kor) 2012-03-01 19:31:58 +00:00
Hawk-v3 bff678772a [PATCH 064/285] TG UPDATES: Santa's toy bag!
Fixed some miscellaneous stuff to prevent round-start crashing.
2012-03-01 03:25:14 +00:00
SkyMarshal 122ed8581f Merge pull request #569 from comma/master
Randomized cig butt sprites (5 variations)
2012-02-29 18:55:48 -08:00
comma e066006f51 Randomized cig butt sprites 2012-03-01 04:44:28 +02:00
SkyMarshal 2b3fbc5047 Merge pull request #566 from Erthilo/master
Added Notebook for the Detective
2012-02-29 16:59:35 -08:00
Ren Erthilo cf2b6ec28c Added Notebook for the Detective. 2012-03-01 00:23:29 +00:00
Mloc 9cee329958 Merge pull request #563 from SkyMarshal/master
Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.
2012-02-29 12:51:48 -08:00
SkyMarshal 4524a2ff10 Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space. 2012-02-29 13:48:16 -07:00
Tastyfish 373dc5937d Merge pull request #551 from SkyMarshal/master
TG updates, improved nuke.
2012-02-28 17:36:12 -08:00
SkyMarshal 66f38fb34b TG UPDATE: Updates to telecomms, bug&runtime fixes, manifest for all, improved nuclear bomb.
All PDA's can access the manifest.
Nuclear bomb now works on realtime.
Telecomms not mapped yet.
Numerous Runtime Fixes
2012-02-28 18:24:43 -07:00
Ren Erthilo 1d858a75a3 Accidentally picked the wrong files... 2012-02-28 19:15:21 +00:00
CIB 27fd036c87 Merge pull request #539 from SkyMarshal/master
Fixed lasers, balanced nuke, removed stupid code, removed Karma, improved admin panel.
2012-02-28 00:44:06 -08:00
SkyMarshal b653c615be Replaced a lot of stupid from the wardrobes and package wrap, they now use an afterattack call instead of specific code for them in EVERY OTHER ITEM.
Improved the admin panel.
Removed Karma.
2012-02-28 00:11:15 -07:00
SkyMarshal f32b6a6e0c Merge pull request #535 from SkyMarshal/master
Added a missing icon, fixed a wardrobe/evidence bag interaction bug, fixed a nuke radio bug, added another update_clothing() call.
2012-02-27 10:09:45 -08:00
SkyMarshal f64dcf2e31 Added a missing icon, fixed a wardrobe/evidence bag interaction bug, fixed a nuke radio bug, added another update_clothing() call. 2012-02-27 11:09:07 -07:00
CompactNinja 07b952c0ee Merge pull request #531 from SkyMarshal/master
More update_clothing() calls.
2012-02-26 22:50:54 -08:00
SkyMarshal 54a1a7e640 Added 2 more update_clothing() calls. 2012-02-26 23:49:47 -07:00
CompactNinja 115b507e67 Merge pull request #529 from SkyMarshal/master
Energy projectiles now move instantly, leaving a straight line from their origin to their destination, like real energy weapons.
2012-02-26 22:40:02 -08:00
SkyMarshal c7af63b281 Energy projectiles now move instantly, leaving a straight line from their origin to their destination, like real energy weapons.
Welderbackpack now has a proper icon.
Stun rounds can now be reduced or blocked by armor
Added more update_clothing() calls
Fixed strangling non-humans.
Blob is now an announcement only.
2012-02-26 23:06:43 -07:00
cib 889d6d93a0 Tons of updates to autopsy.
- Fire, Electrocution, Strangulation, Trace Chemicals and Radiation Poisoning are now detected
- Fixed a bug to head surgery
- You now only hurt subjects on an operating table with a scalpel if your intent is set to harm
- The sheet of paper printed by the autopsy scanner now goes to a free hand if possible
2012-02-27 03:41:24 -08:00
cib 5c5f452cd4 Changes to autopsy.
- Increased the chance to get the murder weapon right.
- New damage types detectable by autopsy: Hot air(fire), explosions, electrocution.
2012-02-27 00:44:25 -08:00
SkyMarshal 74fd808873 Altered functionality of detective scanner.
Fixed that damn book cluster spawning.
Secure doors can now be opened by hitting them with yer hand
Cleaned up surgery tools
People now lie down and stand properly.
For Cajoes: Cleanbot is more robust, and cleans up kitchen messes, now.
2012-02-25 00:17:03 -07:00
Albert Iordache 3c0547f07f Merge branch 'master' of https://github.com/melonstorm/Baystation12 into melonstorm-master
Conflicts:
	maps/tgstation.2.0.8.dmm
2012-02-23 09:53:04 +02:00
SkyMarshal 7631f9c32c Fixed #460, #456, and #478
Cleanbot autopatrols now
Ghosts can see PDA messages, a PDA will show you the fingerprints if it is complete enough (Security scanner)
Display case can be repaired.
More update_clothing() calls
Disabilities have their own window, now.
Removed the genetics scanner, go use yer penlights!
2012-02-21 18:58:28 -07:00
Melvin Melonstorm e808211c50 Fixed missing scientist spawnpoints (d'oh!).
Cyborgs are now notified of AI law changes.
2012-02-19 02:13:01 +01:00
SkyMarshal b5415335d3 Fixed a few runtimes, added debug verbs to help find WTF is up with DNA and 'prints
Improved how disabilities are handled
Fixed some stupid from googol's "smallsize" power
2012-02-18 12:45:01 -07:00
Melvin Melonstorm afd877074c Cyborgs will now be notified of law changes of the AIs they're slaved
to.
2012-02-18 14:51:17 +01:00
SkyMarshal 13769c5325 GODDAMN WHOEVER MAPPED THAT
Also: Added dossier removal to detective comp
Removed extraneous quotes from radio alerts
Altered command channel.
2012-02-18 00:12:31 -07:00
SkyMarshal a36982a677 DNA and chooseable disabilities! Yaaay! 2012-02-17 19:38:30 -07:00
Tastyfish 49b8188af1 fixed matchbook, cig pack, crayon to handle items correctly 2012-02-17 20:45:52 -05:00
Miniature 44e4c6a332 Made labels able to be stuck on containers (issue #430) 2012-02-18 05:39:30 +10:30
Albert Iordache cc6c63edd7 Merge pull request #423 from caelaislinn/master
added a couple of new clothing items, updated some sprites
2012-02-16 08:29:15 -08:00
SkyMarshal 58d7da9008 Missing blood_DNA now goes into admin logs and stuff. 2012-02-15 10:26:22 -07:00
SkyMarshal 5e332d297d Added a sanity check, added some feedback stuff to help identify WTF is happening with blood. 2012-02-14 19:58:21 -07:00
CaelAislinn 95b521dede Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-15 07:04:43 +10:00
CaelAislinn 9d798d3f95 updated some sprites, added new clothing
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-15 06:58:50 +10:00
SkyMarshal 7e140afe56 Added more update_clothing() calls 2012-02-14 12:12:42 -07:00
SkyMarshal 0fe42327a5 This should hopefully reduce processing requirements, by not rebuilding icons every tick.
(Ported oldcode, all props to Strumpetplaya)
2012-02-13 21:54:22 -07:00
Tastyfish aeafc2ffa5 can eat all foods with fork like a sane person now 2012-02-12 07:07:16 -05:00
CaelAislinn 0edd231592 added new custom items
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-11 07:24:50 +10:00
SkyMarshal 8b62eff01a Cleaned up the fingerprint code
Added sanity checks to the clean blood proc.
2012-02-09 09:42:08 -07:00
SkyMarshal 710bcbb42b Final parts for the airlocks.
Wrench -> Weld -> Wrench removes the cover
secure/centcom has all wires electrocute
Emag is now tweaked
Implanted uplink now works.
2012-02-08 17:42:34 -07:00
SkyMarshal 1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
2012-02-08 12:13:03 -07:00
Melvin Melonstorm f8f3f290c5 Fixed a bug with the wardrobe, changed a lot of strings and added a seal for the wardrobe, allowing people to check whether a wardrobe has been opened before or not. 2012-02-08 19:15:10 +01:00