Commit Graph

122 Commits

Author SHA1 Message Date
Lin f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Ghom a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
2019-12-21 11:05:36 +01:00
Ghommie 8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
kevinz000 ded283fa55 Update conveyor2.dm 2019-12-11 14:41:58 -07:00
kevinz000 20defaba8e Update conveyor2.dm 2019-12-08 21:46:53 -07:00
Ghommie 9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
lolman360 dc1c17226d Merge branch 'master' into HeadCorgi 2019-11-28 08:45:19 +11:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
lolman360 216790d442 Merge branch 'master' into HeadCorgi 2019-11-22 21:54:05 +11:00
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
lolman360 4d71f95b16 Merge branch 'master' into HeadCorgi 2019-11-17 12:24:04 +11:00
lolman360 aed866339f pickup pickup pickup pickup 100% pickup 2019-11-17 12:00:17 +11:00
GrayRachnid 3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05:00
kevinz000 6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
Ghommie 592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie 4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00
Ghommie 81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Alonefromhell eee1ccbe2c merge oracle ui from kepler 2019-09-04 11:42:04 -05:00
deathride58 0f48e77990 makes the sound actually play at the right place 2019-01-11 04:58:11 -05:00
deathride58 37d90a780a all items in disposal pipes now make small sounds when they hit corners. all mobs will make very audible sounds when they hit corners 2019-01-11 04:27:53 -05:00
deathride58 0ce450eab8 tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory 2018-10-02 19:36:21 -04:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58 e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
Jordan Brown 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -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 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
pigeons 4d0597ad5b Parenthesizes some macros (#37212)
* parenthesizes some macros

* A couple more macro definition parenthesizing
2018-04-16 03:47:46 -05:00
LetterJay 86ca6b424d Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122
[MIRROR] Fixes interaction AI stuff
2018-04-14 07:44:50 -05:00
AnturK 4e7d222224 Fixes conveyors. (#37152) 2018-04-13 04:30:32 -05:00
kevinz000 9da197469b Fixes interaction AI stuff 2018-04-11 14:10:50 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot 5f6c41fa30 [MIRROR] Ports more operations to "tool_act" (#5718)
* Merge pull request #35854 from ACCount12/more_tool_act

Ports more operations to "tool_act"

* Ports more operations to "tool_act"
2018-02-27 05:04:27 -06:00
Jordan Brown f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
ShizCalev 98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBot 78ca971767 [MIRROR] Adds sprites for conveyor belt constructs (#5276)
* Adds sprites for conveyor belt constructs (#35252)

* lemme just convey this thought

* slight sprite update

* asdf

* Adds sprites for conveyor belt constructs
2018-02-04 23:12:47 -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
Jordan Brown d0c648b702 Merge pull request #34897 from YPOQ/orbitfix
Fixes orbiting stopping when entering disposals
2018-01-26 03:00:16 -06:00
LetterJay f4a817be01 Merge pull request #5049 from Citadel-Station-13/upstream-merge-34820
[MIRROR] Fixes disposal initialization
2018-01-23 10:00:33 -06:00
LetterJay f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522
[MIRROR] Adds ~70 more suicides
2018-01-23 10:00:04 -06:00
AnturK f70c357111 Fixes disposal initialization (#34820) 2018-01-23 06:46:45 -06:00
AnturK eb7974df7d Simple rotation component. (#34476)
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
2018-01-23 02:09:16 -06:00