Commit Graph

112 Commits

Author SHA1 Message Date
ExcessiveUseOfCobblestone
596aea6bbb Spawns a pen-uplink if you don't have one /w pen pref. (#34827)
* Update mind.dm

* ok togopal i guess you could call that a webedit

* AHHHHHH

* xhuis

* I only had 1 cup of coffee today ok

* dost thou hast storage?

* cb

* we did it... we finally did it.
2018-01-24 18:45:21 -06:00
ShizCalev
68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Jordan Brown
f7d70d1454 Merge pull request #34407 from optimumtact/anturredtextsmyevent
Make traitor panel clearer when toggling completion state
2018-01-13 23:21:46 -06:00
JJRcop
ed6ec3d63a Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
AnturK
7a4eef12b8 Fixes mind transfers (#34329)
* Fixes mind transfers

* Don't really see how this is better but sure.
2018-01-11 15:28:41 -06:00
deathride58
d26a9b23a4 datums folder 2018-01-03 23:29:47 -05:00
ShizCalev
c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06: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
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
5f69eac050 Update mind.dm 2017-12-20 00:19:39 -06:00
LetterJay
d6a5ee596b Update mind.dm 2017-12-19 23:55:36 -06:00
LetterJay
36ad355f9d Update mind.dm 2017-12-19 20:08:49 -06:00
LetterJay
a8e36670e2 Update mind.dm 2017-12-19 20:02:03 -06:00
LetterJay
614e93b975 Update mind.dm 2017-12-19 19:26:28 -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
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
oranges
d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -06:00
oranges
cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
CitadelStationBot
43f49c74ee [MIRROR] adds 1 gbp to armhulen's account (grammar fix) (#3936)
* adds 1 gbp to armhulen's account (grammar fix)

* Update mind.dm

* Update mind.dm
2017-11-17 00:29:40 -08:00
LetterJay
14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
f8d96d8692 Update mind.dm 2017-11-07 03:26:48 -06:00
AnturK
2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
Jordan Brown
cab7c8009c Merge pull request #32185 from AnturK/wiztypo
Fixes TP wizarding.
2017-10-29 10:37:03 -05:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
AnturK
6c89f2c8aa Fixes minor runtime 2017-10-25 23:40:59 -05:00
LetterJay
e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
LetterJay
aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
Jordan Brown
94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
AnturK
0faee43f95 Cleans up datum traitor minimally. (#31978)
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
2017-10-22 17:44:55 -05:00
CitadelStationBot
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
LetterJay
f4faabc87c Update mind.dm 2017-10-18 06:27:40 -05:00
AnturK
2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
LetterJay
822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 22:32:52 -04:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
AnturK
724b0d24fe Fixes headrev TP (#31462)
* Fixes headrev TP

* Mhm
2017-10-10 13:20:12 -05:00
vuonojenmustaturska
8b040dddb2 Prioritizes the PDA pen as a traitor uplink location when the pen is selected (#31434)
* you too can be a commit

* requested changes
2017-10-08 19:10:50 -05:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
oranges
5c49bab3c5 Merge pull request #31135 from KorPhaeron/unconvertable
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
AnturK
6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -05:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
LetterJay
8140b2647a Update mind.dm 2017-09-25 12:26:26 -05:00
LetterJay
f5d8051f4d Update mind.dm 2017-09-25 12:08:06 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
AnturK
ea6e1356ba Fixes create antag wizard 2017-09-23 11:12:29 -05:00