Commit Graph

93 Commits

Author SHA1 Message Date
LetterJay
d540b69adc Update nuclearbomb.dm 2018-01-23 08:20:52 -06:00
coiax
f425c5496f Fake nuclear disks are even more convincing 2018-01-23 01:41:21 -06:00
Jordan Brown
e84617f17b Datum var cleanup (#34314)
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
2018-01-21 21:39:46 -06:00
AnturK
6354c6eec5 Moves creating tag before intialization (#34512)
* Moves creating tag before intialization

* Two nukes for price of one.

* coord
2018-01-19 08:41:24 -06:00
deathride58
0ab9e0e209 Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:44:52 +00:00
deathride58
1bfba8fd50 Update nuclearbomb.dm 2018-01-04 20:56:53 -05:00
ShiggyDiggyDo
8a176e126e You now have to stand next to the decoy nuke disk and examine it to know it's fake 2018-01-04 15:17:43 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
9d90a2bf5b Update pinpointer.dm 2017-12-19 19:30:54 -06:00
LetterJay
c545ef06cd Update nuclearbomb.dm 2017-12-19 19:30:23 -06:00
LetterJay
951a540882 Update nuclear.dm 2017-12-19 19:29:27 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -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
Jordan Brown
70be12aa1c Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 15:52:53 -06:00
deathride58
21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
oranges
cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
Leo
4d1ea753c3 Removes some attackby crowbar checks on nuclear bombs and camera assemblies (#32726) 2017-11-14 17:44:49 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Emmett Gaines
5bcc90d3c1 removes search_contents_for proc (#32411) 2017-11-05 02:07:16 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
LetterJay
f53d0844fc Merge pull request #3275 from Citadel-Station-13/upstream-merge-31483
[MIRROR] Removes a spawn from nukeop gamemode code
2017-10-10 05:55:48 -04:00
oranges
1843738e7c Merge pull request #31483 from kevinz000/patch-329
Removes a spawn from nukeop gamemode code
2017-10-10 03:23:14 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
vuonojenmustaturska
98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
oranges
1a9d36b3f1 Merge pull request #31078 from pubby/opspawn
Cleanup operative landmarks
2017-09-28 21:48:11 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
Poojawa
dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818)
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
2017-09-17 11:56:55 -05:00
CitadelStationBot
f07369aead [MIRROR] Fixes nuking the syndicate base (#2767)
* Merge pull request #30694 from KorPhaeron/syndie_nuke

Fixes nuking the syndicate base

* Fixes nuking the syndicate base
2017-09-14 13:24:43 -05:00
CitadelStationBot
9a4f84da5e [MIRROR] Refactors roundstart centcom threat report. (#2739)
* Refactors roundstart centcom threat report.

* Update blob.dm

* Update changeling.dm

* Update traitor_chan.dm

* Update sandbox.dm

* Update traitor.dm
2017-09-13 22:50:01 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
bf5094cf19 Update nuclearbomb.dm 2017-09-11 18:40:30 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJay
26c6f5cc14 Update pinpointer.dm 2017-09-11 13:07:35 -05:00
LetterJay
052fdb70ea Update nuclearbomb.dm 2017-09-11 13:06:27 -05:00
LetterJay
6a47a7011a Update nuclear.dm 2017-09-11 13:05:22 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
CitadelStationBot
50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00