Commit Graph

2172 Commits

Author SHA1 Message Date
deathride58 695bbef473 makes spears require priming to explode on throw, makes it possible to rip embedded objects out instantly by pressing resist if the item is normal sized or larger (#7450) 2018-08-23 00:30:33 -07:00
deathride58 21064fb860 nerfs emp defibs by giving their disarm act a 1 second timer (#7483) 2018-08-23 00:24:27 -07:00
kevinz000 ccfa495a27 Update pneumaticCannon.dm 2018-08-17 16:02:01 -07:00
deathride58 4f36f3d263 Merge pull request #6945 from ElPresidentePoole/master
Allows players to commit seppuku with any katana, adds SFX for seppuku
2018-08-17 16:55:28 -04:00
deathride58 c88ceccfe0 Merge pull request #7462 from Citadel-Station-13/kevinz000-patch-5
fixes telekenetic snatching from toilets where some captains hide the spare id
2018-08-17 16:50:18 -04:00
kevinz000 15f1d48311 Update watercloset.dm 2018-08-14 22:01:38 -07:00
kevinz000 6166d15d40 Update bedsheet_bin.dm 2018-08-14 21:57:49 -07:00
kevinz000 f50b370fd1 Update bedsheet_bin.dm 2018-08-14 21:56:44 -07:00
deathride58 279ebaf27a Merge pull request #7429 from Citadel-Station-13/kevinz000-patch-9
family heirloom toolboxes are now bulky items but take less stamina to swing, have 2 extra damage, as well as 20 extra damage to structures/objects
2018-08-12 20:38:00 -04:00
Letter N 6f84c924e1 ser.lazy == true (#7453) 2018-08-12 17:37:36 -07:00
deathride58 26a11df5c5 Merge pull request #7386 from Citadel-Station-13/photography_update
Photography update - Photo persistence, 7x7 photos, adjustable camera photo size, photo logging with full metadata, etc etc
2018-08-04 00:22:07 -04:00
kevinz000 0ee8542677 Update toolbox.dm 2018-08-01 21:27:43 -07:00
kevinz000 5ccda57266 Update wormhole.dm 2018-07-24 01:06:37 -07:00
kevinz000 6e03770b93 Wormhole Update 2018-07-21 01:07:21 -07:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 6670284b62 fixes items spawning on top of closets rather than inside closets (#7361) 2018-07-20 03:41:34 -07:00
deathride58 f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
deathride58 00128fe87e nerfs gas tank ruptures by reducing the effective pressure of a gas tank rupture from ^4 to ^3 (#7373) 2018-07-18 15:18:23 -07:00
deathride58 a18525ad06 Merge pull request #7366 from Citadel-Station-13/mirror-38933
[requires testmerge]upstream mirror - projectile pathing/hitscan lighting refactor
2018-07-17 11:19:07 -04:00
kevinz000 b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000 bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
Bear 88fb190bed display images modularizing 2018-07-10 18:05:16 -04:00
Bear 4f48bc2dd5 pAI screen displays 2018-07-10 07:37:16 -04:00
deathride58 8b58db057e Merge pull request #7355 from Citadel-Station-13/upstream-merge-38934
[MIRROR] Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects
2018-07-10 01:56:32 -04:00
deathride58 6a5087877b Merge pull request #7129 from PolymorphBlue/vTecControl
Modifies the vTec cyborg upgrade to be toggleable between off/half/full
2018-07-09 00:26:23 -04:00
vuonojenmustaturska 417496aa6e Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects (#38934)
* Wrap setting anchored for structures, fix atmos bug

* forgot this

* Add a signal for setanchored

* move setanchored to obj

* machinery, also some structure stuff

* tabbing
2018-07-06 13:28:01 -05:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot 06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327)
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852)

* a commit message

* reviews addressed?

* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
2018-07-04 18:38:53 -07:00
Letter N abc32ed0df adds "cap's female formal outfit" (#7307)
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
2018-07-04 05:37:01 -07:00
deathride58 f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
CitadelStationBot 0500be9b35 [MIRROR] Fixes some shard harddel stuff. (#7299)
* Fixes some shard harddel stuff. (#38799)

* Fixes some shard harddel stuff.
2018-07-02 06:44:50 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
LetterJay 74f7e56f4e Merge pull request #7284 from Citadel-Station-13/upstream-merge-38797
[MIRROR] Fixes TGUI runtime
2018-07-01 09:41:03 -05:00
LetterJay 42c322ca2c Merge pull request #7281 from Citadel-Station-13/upstream-merge-38789
[MIRROR] Cleans up leftover telesci teleporter code
2018-07-01 09:39:08 -05:00
LetterJay b5b8ce5337 Merge pull request #7280 from Citadel-Station-13/upstream-merge-38751
[MIRROR] Updates plastic flaps icon and cleans up its code
2018-07-01 09:38:16 -05:00
LetterJay 2b9aca8143 Merge pull request #7279 from Citadel-Station-13/upstream-merge-38795
[MIRROR] [s] Fixes PDA ID teleporting
2018-07-01 09:37:45 -05:00
LetterJay be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656
[MIRROR] Makes the deconstructable TEG working
2018-07-01 09:36:57 -05:00
LetterJay 74730261b0 Merge pull request #7258 from Citadel-Station-13/upstream-merge-38689
[MIRROR] Move throwforce up to atom/movable
2018-07-01 09:30:09 -05:00
LetterJay de6ae20f87 Merge pull request #7254 from Citadel-Station-13/upstream-merge-38644
[MIRROR] Port AI static to vis_contents
2018-07-01 09:29:10 -05:00
LetterJay cd842fc20f Merge pull request #7250 from Citadel-Station-13/upstream-merge-38702
[MIRROR] Remove unused and probably misbehaving admin human manifest spawner
2018-07-01 09:27:45 -05:00
ShizCalev 8c410b92a7 Fixes TGUI runtime (#38797)
ui_interact was being called on usr instead of M
2018-07-01 05:44:17 -05:00
ShizCalev 452b34caa2 Cleans up leftover telesci teleporter code (#38789) 2018-07-01 05:43:43 -05:00
TerraGS 2d3969882a Updates plastic flaps icon and cleans up its code (#38751)
cl
imageadd: New icon for plastic flaps that actually looks airtight.
code: Update to plastic flaps code to use tool procs rather than attackby and removed two pointless states.
/cl

Gives plastic flaps an airtight look to fit their new property. Removes two defines that were just a functional copy of anchored. Replaces calls to attackby() with screwdriver_act() and wirecutter_act().
2018-07-01 05:43:01 -05:00
ShizCalev b523a59ae5 Fixes PDA ID teleporting (#38795) 2018-07-01 05:42:40 -05:00
Dennok 58f634db63 deconstructable-TEG (#38656)
Make TEG deconstructable.
2018-07-01 05:41:53 -05:00
Tad Hardesty 83a4003660 Move throwforce up to atom/movable (#38689) 2018-06-26 15:27:09 -05:00
deathride58 e2234a7fc4 Merge pull request #7149 from Citadel-Station-13/upstream-merge-30862
Flashbangs no longer hurt blobs
2018-06-26 14:07:53 -04:00
Jordan Brown a14bc0615d Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
Port AI static to vis_contents
2018-06-25 20:23:32 -05:00
Jordan Brown ac300966f5 Merge pull request #38702 from vuonojenmustaturska/cleanup
Remove unused and probably misbehaving admin human manifest spawner
2018-06-25 10:34:57 -05:00