Commit Graph

13231 Commits

Author SHA1 Message Date
Steelpoint
f72ced26fd PulseRifleVarients+ArmouryRooms+FixesAndRefinements 2015-01-01 13:33:23 +08:00
Steelpoint
3c8062b216 SwapToBaysERTSprites+CommanderSuit 2014-12-31 22:41:25 +08:00
Steelpoint
dd111a7c54 EmergencyResponseTeam 2014-12-31 17:31:45 +08:00
Perakp
953aab610c Changes a few more checks to accept drones in addition to silicons. 2014-12-30 13:50:10 +02:00
Perakp
ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
tkdrg
2607a456c0 Merge pull request #6634 from paprka/chefuniform
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
hornygranny
a9ea5e98a9 Update walls.dm 2014-12-29 20:31:47 -08:00
paprka
1cfdf56f0c fixes the switch checks 2014-12-29 19:29:31 -08:00
paprka
742d7b4383 IRON CHEF switches 2014-12-29 19:26:13 -08:00
hornygranny
9ee5d52814 Merge pull request #6601 from paprka/walkthecat
Adds catwalks
2014-12-29 19:05:41 -08:00
tkdrg
78e5b9e7c7 Merge pull request #6616 from paprka/pointerpride
Adds mouse pointers for different ui styles
2014-12-29 16:47:07 -03:00
Ergovisavi
d7765cd75f Merge pull request #6630 from tkdrg/rpdcolor
Tested, appears to be functioning as advertised. Cue drones making absurd disposal rides.
2014-12-29 11:14:20 -08:00
tkdrg
df2271c300 Merge pull request #6640 from Nyvrem/master
Preferred colours for Podpeople
2014-12-29 15:00:01 -03:00
tkdrg
d96e8df573 Fixes some RPD bugs
Fixes pipe painting not working
Fixes 4-way manifolds and disposals chutes displaying broken icons
Fixes the lack of Sort Junctions from the RPD
Fixes #6627
Fixes drones being unable to use the RPD
2014-12-29 14:51:41 -03:00
tkdrg
48374658a8 Merge pull request #6638 from paprka/beamexplody
Fixes disabler beams exploding fuel tanks
2014-12-29 10:37:43 -03:00
paprka
58b10962dc clicking on the lattice will now construct a catwalk as well 2014-12-29 05:24:48 -08:00
tkdrg
80cc2d4100 Merge pull request #6622 from Thunder12345/grammarFixes
Fixes for some grammer and formatting issues
2014-12-29 10:20:35 -03:00
Thunder12345
d7dd967c34 Simplification
Simplified nuzzling, never knew visible_message wound repeat the first
argument if there weren't any others.
2014-12-29 11:35:48 +00:00
tkdrg
ad2fee37be Merge pull request #6625 from phil235/HalluAttackAnimationFix
Fixes hallucinated attackers not doing the attack animation.
2014-12-29 01:56:19 -03:00
tkdrg
dc6f1895fe Merge pull request #6608 from paprka/disablerrebuff
Reverts disabler nerf
2014-12-29 01:12:52 -03:00
tkdrg
67b32194f1 Merge pull request #6612 from paprka/fixesstamdamprojguns
Fixes stamina damage on projectile weapons
2014-12-29 00:57:24 -03:00
paprka
1869e9d6ae reverts c90r stuff 2014-12-28 19:47:54 -08:00
paprka
152be974dc reverts return change (returns return change?) 2014-12-28 18:53:44 -08:00
paprka
bbc83fed1c Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy 2014-12-28 18:39:39 -08:00
paprka
56d54d1294 Added changelog and fixes compile errors with preferences 2014-12-28 18:24:53 -08:00
paprka
2e8907ed4c adds a preference for custom pointers 2014-12-28 18:13:48 -08:00
tkdrg
91685820f2 Merge pull request #6588 from phil235/WindowEjectionFix
Removed the ability of windows to be unanchored and ejected when low on health
2014-12-28 21:20:02 -03:00
Nyvrem
05a1cadac3 Preferred colours for podpeople
Make podpeople use preferrence colours instead of being grey with black eyes.
2014-12-28 18:39:20 +01:00
paprka
88a0ee34f4 fixes disabler beams exploding fuel tanks 2014-12-28 03:15:26 -08:00
paprka
e8738e8dd5 Changes some clothing and chef gear 2014-12-28 02:13:28 -08:00
paprka
e296770f9a updates chef apron sprite, fixes names 2014-12-28 01:28:44 -08:00
paprka
d57256cf11 makes the second cook spawn in short order clothes, fixes chef uniform 2014-12-28 01:12:49 -08:00
paprka
acd40bdde8 further updates smoothing and icons 2014-12-28 00:17:19 -08:00
paprka
79e2eedacb Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-27 22:26:21 -08:00
tkdrg
5074b76a1e Merge pull request #6609 from Jordie0608/endcaptaininequality2015
Added log to RC announcements
2014-12-28 02:39:37 -03:00
tkdrg
bf25d38fb2 Merge pull request #6607 from paprka/aiturrets
Fixes ai turrets having disable mode instead of stun
2014-12-28 02:21:04 -03:00
paprka
e33d2c02bc fixes ai turrets for real this time 2014-12-27 21:12:48 -08:00
tkdrg
c57c75b232 Merge pull request #6604 from paprka/disablerhitsound
Disabler now makes a sound when it hits
2014-12-28 02:06:55 -03:00
tkdrg
60fc73d018 Merge pull request #6587 from phil235/MonkeyBiteMaskFix
Fixes being able to bite as a monkey with your mouth covered by a mask.
2014-12-28 01:01:14 -03:00
Ergovisavi
ff68a2d55b Merge pull request #6490 from tkdrg/nomoreadmingrudges
Adds cfg option to let players see their own notes
2014-12-27 19:25:43 -08:00
phil235
3994ac3f48 Fixes hallucinated attackers not doing the attack animation.
Fixes lack of attack animation, sound and attack cooldown when the human mob attacks the hallucinated attacker.
Removes some commented code and some duplicated checks.
Reorganized the hallucination procs a bit.
2014-12-27 22:41:13 +01:00
Swag McYolosteinen
4205b8d531 Merge pull request #6620 from Menshin/missed_designs
Fixes missing designs for the protolathe construction
2014-12-27 20:35:08 +01:00
tkdrg
cc474b2af6 Merge pull request #6591 from phil235/FingerlessSpriteFix
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
Thunder12345
744940c8a8 Fixes #6615
All instances of "Your clothes feel warm" have been given a full stop.
Couldn't actually confirm in testing due to never getting the warm
clothes message, but I don't see why it wouldn't work.
2014-12-27 18:32:45 +00:00
Thunder12345
faf5a1dd07 Fixes #6547
Shortening a shotgun now uses proper grammar, and displays the original
name of the shotgun for the finish message:
"X shortens the improvised shotgun"
instead of:
"X shortens the sawn-off improvised shotgun"
2014-12-27 18:19:04 +00:00
tkdrg
7f7fad7ac9 Merge pull request #6586 from phil235/ResonatorTableFix
Fixes the resonator being activated when placed on a table/closet/storage
2014-12-27 15:06:36 -03:00
phil235
f8b7a2066f Merge pull request #6559 from tkdrg/hal
Adds sanity checks to supermatter Consume()
2014-12-27 18:42:01 +01:00
Thunder12345
d1efc0c002 Fixes #6548
Simple animal friendly attacks (Ones that do no damage) now use the
notice span class, to match hugging.
2014-12-27 17:27:55 +00:00
phil235
a614839f82 Merge pull request #6573 from paprka/fixescaps
Fixes capgun ammo sprites
2014-12-27 18:14:28 +01:00
Menshin
9d430e1470 Done some missed designs for the R&D revamp. 2014-12-27 16:49:11 +01:00