49150c542f
Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too ( #37035 )
...
* APC crap
* moar define
* honk
* cover defines
2018-05-02 01:32:34 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
b368ab377b
fixes obj descs and adds new ones ( #37483 )
2018-04-27 13:21:08 -05:00
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
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
0016b323f6
[MIRROR] Lowers damage cap on breaking hacked apcs ( #6026 )
...
* lowers damage cap on breaking apcs (#36520 )
* Lowers damage cap on breaking hacked apcs
2018-03-19 21:44:19 -05:00
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
bc2f2a9728
[READY]Randomized Station Time + Night Shifts
2018-02-21 12:02:28 -06:00
f9353da855
Quote the armor lists
2018-02-16 00:26:26 -06:00
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
f4685cfe01
[s] Fixes altclick exploits
2018-02-11 05:08:00 -06:00
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
2b4735ded0
Merge pull request #34384 from F-OS/patch-3
...
Quality of life: Newly constructed APCS are unlocked
2018-01-14 21:32:38 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
5621507b4a
Adds emergency lights, built into light fixtures
2017-12-03 12:54:48 -06:00
541b8db684
Merge pull request #32985 from YPOQ/airlockfix
...
Fixes AIs being unable to interact with unscrewed airlocks
2017-11-24 14:11:39 -06:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
b9c9b87441
Alt clicking additions ( #32607 )
...
Adds alt clicking to lock/unlock for apc and air alarm
2017-11-14 13:49:32 -06:00
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
4fd360c694
Fixes cogged APCs being permanently locked to non-servants ( #31673 )
...
* Fixes cogged APCs being inaccessible
* Doop ba doop
2017-10-16 16:49:01 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
a286d0c313
[MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction ( #2875 )
...
* Gives engineering cyborgs an item they can use in place of circuits for basic construction
* fixes
2017-09-22 23:35:54 -05:00
8406baebbe
Makes APC cell_type actually pick a cell ( #2747 )
...
* Ports TG#30327
* Update apc.dm
* maybe delta can be fully copies over, yes?
2017-09-13 19:57:21 -05:00
083fc1a7b4
[MIRROR] Standardized power displays ( #2539 )
...
* Standardized power displays
* Update tgui.js
* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
6951e39d13
Update apc.dm
2017-09-11 13:10:54 -05:00
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
4a456fd2c7
Fixes APC pixel shift being off
2017-08-28 02:20:25 -05:00
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
68830dac71
Changes smes, cells, cell charger, terminals and apcs icons
2017-08-16 20:02:24 -05:00
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
0e7b9a008e
Ports a slightly edited version of Eris APC sprites
2017-08-13 17:54:27 -05:00
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
d21766956e
[MIRROR] Cleaned up some emag_acts ( #2018 )
...
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
2017-07-15 13:17:56 -07:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
vuonojenmustaturska