Commit Graph

2105 Commits

Author SHA1 Message Date
SkyMarshal
df5909446e Merge pull request #634 from Miniature/master
Attack logging (finally)
2012-03-07 20:49:02 -08:00
Miniature
cf53a0cc7a Attack logging (finally)
there might be some things I missed, and feel free to change the messages if you want
2012-03-08 15:16:54 +10:30
SkyMarshal
8e96007b35 Merge pull request #631 from Erthilo/master
Hypospray can now fit on medical belt. Fixed torso bugs. Fixed custom item derp. Small typo fixing.
2012-03-07 16:38:52 -08:00
SkyMarshal
7bc39b8733 Few more bugfixes. 2012-03-07 16:21:17 -07:00
SkyMarshal
25fc27849b HOTFIX! 2012-03-07 15:25:28 -07:00
Ren Erthilo
ce9e6d3666 Hypospray can now fit on medical belt. Small typo fix. Fixed my derp with custom items. 2012-03-07 22:00:20 +00:00
SkyMarshal
7e15046dc2 Merge pull request #630 from Hawk-v3/master
TG Updates: New doors, eggs in fridge, new lockers.
2012-03-07 13:26:26 -08:00
SkyMarshal
c522b5db7b Holy shit did that speed things up. 2012-03-06 21:09:56 -07:00
SkyMarshal
f0b3802b10 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-06 19:10:39 -07:00
Hawk-v3
d777257d33 [PATCH 106/285] TG Updates: Chef has eggs again, now located in his normal fridge. I hope this doesn't mess up all the egg nog :'( 2012-03-06 23:28:26 +00:00
baloh.matevz
a9dda517f1 TG Updates: Engineering lockers (personal, welding supplies, CE and electrical) now have custom sprites... and they're yellow.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2798 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-06 23:24:56 +00:00
Hawk-v3
17f128cb02 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	baystation12.dme
2012-03-06 19:24:38 +00:00
Hawk-v3
f1f6a0bc6f Making the remote access clear. 2012-03-06 17:44:59 +00:00
Ren Erthilo
87502c38b7 Made emagged cyborgs laws gender neutral and use crew. Small reset module description change. 2012-03-06 10:22:34 +00:00
SkyMarshal
3cb0a51b7f Fixed a smidgen of derpiness with that last code. 2012-03-05 17:22:52 -07:00
SkyMarshal
43f7487429 Some optimizations for fingerprints. General debugging. 2012-03-05 16:33:47 -07:00
SkyMarshal
7534154fa2 Cleaned up some code, fixed a bug with dead/sleeping people seeing you talk into headsets, reworked guncode some, readded point-blank shooting, removed disposal space cannon, hacktool works on windoors and secure closets, now. 2012-03-05 12:27:55 -07:00
Ren Erthilo
b92ecb932b Added custom items. Small fix for labcoat buttons and descriptions. 2012-03-05 17:52:28 +00:00
Mloc
d372db14f3 Fix for telecoms and cameras.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-03-04 16:26:42 +00:00
Albert Iordache
3fcf067310 Merge pull request #613 from SkyMarshal/master
Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event, fixed Tajspeak, fixed the blob, fixed overdoses
2012-03-03 23:55:37 -08:00
SkyMarshal
71a9961b0c Made turret identifiers update all other ones in the area. 2012-03-03 23:54:24 -07:00
SkyMarshal
884fd25f78 Fixed the rest of Tajspeak, radios now give a cue when someone talks into it, fixed throwing and tables, fixed bloodiness, fixed autofiring vars.
You can throw over tables again.
Fixed some bloodiness not being added.
Fixed some vars not being reset.
2012-03-03 23:45:20 -07:00
Albert Iordache
1575df93ce Merge pull request #614 from comma/master
Some derpfixes
2012-03-03 22:26:54 -08:00
comma
5ad05105f4 Small bugfix to ashtrays and cig butts
Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore.
Also glass ashtray now shatters with sound
2012-03-04 06:45:14 +02:00
SkyMarshal
4d7cfb5e34 Another mapupdate, de-nerfed blob, readded the missing Tajaran speak. 2012-03-03 21:08:49 -07:00
SkyMarshal
0a31e76f0f Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-03 20:26:49 -07:00
SkyMarshal
ba9b919211 Whoops. 2012-03-03 20:26:33 -07:00
SkyMarshal
3e3534f00b Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event.
Map update has a redone CE's office and AI upload.
Explosions now let admins jump to them.
2012-03-03 20:23:10 -07:00
Mloc
8ae3d23684 Merge pull request #611 from SkyMarshal/master
Fixes for package wrap, added proper buttons and hotkeys to the gun system, fixed PDA manifest.
2012-03-03 14:41:01 -08:00
SkyMarshal
1107f6e768 Fixes for package wrap, added proper buttons and hotkeys to the gun system, fixed PDA manifest. 2012-03-03 15:08:01 -07:00
Ren Erthilo
d786d8642f Fixed roller bed. 2012-03-03 18:06:40 +00:00
SkyMarshal
1e4bdf7183 Fix for bloodying shoes when walking in blood. 2012-03-02 20:14:27 -07:00
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
Hawk-v3
fe70dccc58 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-02 22:57:14 +00:00
Hawk-v3
9d69c86308 Fixes compile Errors, take it away with the doors, Sky! 2012-03-02 22:55:42 +00: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
Hawk-v3
bc84c1efb0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-02 19:07:44 +00: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
SkyMarshal
0d8c7d5e51 Reworked the gun system to handle hostage scenarios better.
Ported and adjusted with permission from Lost Worlds.
2012-03-01 19:20:39 -07: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
bfac567c87 Revert "Subject: [PATCH 093/285] TG Updates: Added a brown mining airlock."
This reverts commit 243d1f2fab.
2012-03-01 22:04:28 +00:00
Hawk-v3
243d1f2fab Subject: [PATCH 093/285] TG Updates: Added a brown mining airlock. 2012-03-01 21:36:30 +00:00
petethegoat@gmail.com
34f3012e98 TG Update: You can now fit basic pipes directly into wall girders. You probably won't notice this, but it makes things slightly easier for atmos techs.
Several instances of ReplaceWithFloor changed to ReplaceWithPlating- the floor tiles under walls were annoying me. RCDs now create plating instead of floor also.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2786 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 21:29:32 +00:00
Hawk-v3
3079a89516 Commit for next update 2012-03-01 21:22:43 +00:00
Hawk-v3
bdff096c4c Subject: [PATCH 086/285] TG UPDATES:
- Simple event dispatch system.
- atom.forceMove() proc. Ignores density and other Move()restrictions, but calls Exited() and Entered()
- var/emagged moved to /obj/machinery class - anyprob() helper proc.
- Mecha internal damage varsencapsulated.
- Mech Fabricators now require robotics ID to operate. Emag removes this restriction.
- Added Odysseus Medical Exosuit and it's parts. Has integrated Medical Hud and ability to mount medical modules.
- Added Sleeper Medical module for medical exosuits. Similar to common sleepers, but no ability to inject reagents.
- Added Cable Layer module for exosuits. Load with cable (attack cable with it), activate, walk over dismantled floor.
- Added another exosuit internal damage type - short circuit. Short-circuited exosuits will drain powercell charge and power relay won't work.
- You should be able to send messages to exosuit operators using Exosuit Control Console
- Gygax armour and module capacity nerfed.
- Exosuit weapon recharge time raised.
- Bugfix: EMP actually drains exosuit cell and damages it
2012-03-01 20:50:19 +00:00
Hawk-v3
6ced35a88d Stuff for next patch 2012-03-01 20:42:48 +00:00
SkyMarshal
14366e389d Merge pull request #578 from Hawk-v3/master
MORE TG UPDATES
2012-03-01 12:03:50 -08:00
musketstgstation@gmail.com
96fe016964 Fixed an accidental revert of an iconstate change from r2795 (erro, when you change the iconstate mention it in the commit log plzkthx)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2797 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-01 19:53:29 +00:00