Commit Graph

271 Commits

Author SHA1 Message Date
LetterJay
b2114a7b81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-08-29 21:19:22 -05:00
CitadelStationBot
d55bac862e Updates out of date documentation 2017-08-28 14:52:27 -05:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
CitadelStationBot
14ceaa39b4 Fixes component dupe checks not actually checking if there IS a dupe component (#2501) 2017-08-26 19:11:03 -07:00
kevinz000
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
LetterJay
259edee5a2 Update component.dm 2017-08-21 18:49:14 -05:00
LetterJay
17c0c4ba79 FUCK 2017-08-21 18:39:30 -05:00
LetterJay
39a69c2a28 Update component.dm 2017-08-21 16:50:29 -05:00
LetterJay
ab26b486b7 Update component.dm 2017-08-21 02:38:51 -05:00
LetterJay
46e7d7a9c4 Merge branch 'master' into upstream-merge-29647 2017-08-19 12:25:49 -05:00
LetterJay
2c33ef3ab0 Update component.dm 2017-08-18 13:56:47 -05:00
LetterJay
fa8ed2de17 Update component.dm 2017-08-14 09:13:33 -05:00
LetterJay
bfbc3e198c Merge branch 'master' into upstream-merge-29523 2017-08-14 08:30:40 -05:00
CitadelStationBot
3e96c59bb7 Fixes SendSignal() 2017-08-03 13:15:13 -05:00
CitadelStationBot
6cd0855b5a Unifies datum var definitions (#2237) 2017-08-03 06:02:58 -07:00
LetterJay
468b14a011 Update component.dm 2017-08-02 06:04:43 -05:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
a2e487c86e Makes GetComponent() faster using typecache magic 2017-08-01 16:59:50 -05:00
LetterJay
29f8f8eb45 Update component.dm 2017-07-31 23:36:49 -05:00
CitadelStationBot
50adcbb302 DCS Continued 2017-07-24 16:45:14 -05:00
LetterJay
22ed4d63b9 Rename code/datums/component/components.dm to code/datums/components/component.dm 2017-07-19 13:22:20 -05:00