Commit Graph

85 Commits

Author SHA1 Message Date
kevinz000 6758761a65 Update action.dm (#11521) 2020-03-18 19:44:33 +01:00
kevinz000 d7c5b87263 Update action.dm 2020-03-08 21:24:52 -07:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000 56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Detective Google ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -06:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Ghom 2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
ancientpower a85f05a628 requested changes 2020-02-04 16:58:24 -06:00
ancientpower 0d6ffbc432 fixed it for real this time 2020-02-04 16:38:20 -06:00
ancientpower 9dd411f11b fixes the restoration for reals 2020-02-04 16:11:12 -06:00
ancientpower 524836c2b2 restores drink flinging 2020-02-04 15:48:03 -06:00
Seris02 49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
ancientpower 937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06:00
Seris02 934c8fe533 updates + thingamajig 2020-01-23 15:25:45 +08:00
kevinz000 6e31db958c fixes 2020-01-20 12:08:18 -07:00
Seris02 a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08:00
Seris02 5524b0fa03 yes. 2020-01-20 13:00:24 +08:00
kevinz000 f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Seris02 25d7af31a5 merge fixes 2020-01-19 16:36:04 +08:00
Seris02 f54417f99e fixes 2020-01-19 15:50:48 +08:00
Seris02 04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000 1d184b8cad s 2020-01-16 00:21:21 -07:00
kevinz000 350c5aa060 compile 2020-01-16 00:18:40 -07:00
kevinz000 26525b8fa7 s 2020-01-16 00:14:03 -07:00
Putnam 6e9d13e48f Replace the cryopod with a simple ghost button. 2019-12-30 01:52:06 -08:00
Seris02 160e8c1ec5 stunglasses 2019-12-27 23:21:40 +08:00
BonniePandora 5efed32095 Ports Welding Hard Hats from /tg/
Changelog:
modules/clothing/head/Hardhat.dm:
-Added Welder Hard Hats & various colours
--They function as a combi hard hat & welder mask, but have a slightly dimmer head lamp
modules/clothing/vending/wardrobes.dm
-Added 3 Welder Hard Hats to the Engi-drobe and Atmos-drobe
-Equalized some values between the two (3 atmos winter coats now instead of 5, and 3 engineering dufflebags instead of 2)
game/objects/structures/crates_lockers/closets/secure/engineering.dm
-Replaced the welding mask in the CE's locker with a white WHH (This one has brighter buld in it! Same brightness as a regular hard hat)
datums/action.dm
- Added the item_action to lower the WHH's face shield
icons/mob/head.dmi
-Added weldervisor + welderhat, which are used by the WHH's
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
icons/mob/obj/hats.dmi
-Added weldervisor, again, used by the WHH's
-Repositioned the hardhat sprites up several pixels so they don't clip and look weird with the weldervisor
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
2019-11-04 02:29:56 +00:00
Trilbyspaceclone 937c809b0b Update action.dm 2019-07-31 12:57:10 -04:00
Ghommie 5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
deathride58 cfaa0041b9 ports tgstation/tgstation#40260 2018-11-20 19:28:32 -05:00
Poojawa b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58 b604390f33 Ports tgstation/tgstation#39302 with adjustments, see desc of commit (#7424)
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07:00
Tad Hardesty ecd16515c5 Remove datum/action/generic (#38201) 2018-05-31 22:40:17 -05:00
deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
Poojawa 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58 d26a9b23a4 datums folder 2018-01-03 23:29:47 -05:00
LetterJay a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
Robustin d7723a064c Spell action buttons finally fixed (#33882)
* Action button fix

* Action button fix

* Spell action button fix

* Spell action button fix

* Update alien_powers.dm

* Update spell.dm

* Action button fix

* Update touch_attacks.dm
2017-12-29 02:54:50 -06:00
kevinz000 bec20087c2 [READY]Clownborgs - ADMIN SPAWN ONLY 2017-12-22 10:58:13 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
jammer312 c55b914f06 Makes actionbuttons remember positions where you locked them. 2017-12-08 10:33:54 -06:00