Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +01:00 |
|
Hatterhat
|
590d71ddc1
|
hey ghom i fixed it i think
|
2020-01-18 23:35:52 -06:00 |
|
Hatterhat
|
080cb74893
|
tgstation 40920 tweaked and tested for cit
|
2020-01-10 22:56:11 -06:00 |
|
Ghommie
|
a5b37b658b
|
Purging a lot of space indention in favor of tabs.
|
2019-10-29 15:46:31 +01:00 |
|
Ghommie
|
ec2a3ea778
|
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-07-31 18:56:00 +02:00 |
|
deathride58
|
af68012d7d
|
makes teleporters viable - increases the range of all launchpads across the board (#7729)
|
2018-11-16 14:46:13 -08:00 |
|
Poojawa
|
8b9ef1e400
|
Game folder
|
2018-09-11 04:06:45 -05:00 |
|
Jordan Brown
|
e95851c8f6
|
Merge pull request #38476 from AutomaticFrenzy/patch/sparks
[s] Fix launchpads creating way too many sparks
|
2018-06-16 15:53:42 -05:00 |
|
Jordan Brown
|
5e15a988f6
|
Refactor machinery to default to being anchored
|
2018-06-01 11:28:19 -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 |
|
Dax Dupont
|
4850230fc4
|
Refactors and fixes RPEDs
|
2018-04-27 13:13:37 -05:00 |
|
Dax Dupont
|
b6396256db
|
[s] Adds a centcom level check to launchpad. (#37120)
* Adds a centcom level check to launchpad
* Account for space americans
|
2018-04-11 08:58:50 -05:00 |
|
oranges
|
5dc3549801
|
Merge pull request #35542 from ShizCalev/free-spam-removal
Cleans up some duplicate canusetopic warnings
|
2018-02-15 20:35:03 -06:00 |
|
ShizCalev
|
f4685cfe01
|
[s] Fixes altclick exploits
|
2018-02-11 05:08:00 -06:00 |
|
CitadelStationBot
|
cc0b768c72
|
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
|
2017-12-11 16:36:38 -08:00 |
|
ShizCalev
|
5abd1bcdd9
|
Cleans up some qdel(src)'s in Initialize()
|
2017-11-26 20:15:18 -06:00 |
|
kingofkosmos
|
63122795f9
|
Adds missing span-endings
|
2017-09-11 07:10:09 -05:00 |
|
LetterJay
|
188193eb61
|
here we go again (#2456)
|
2017-08-24 19:24:25 -07:00 |
|
kevinz000
|
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 |
|
kevinz000
|
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 |
|
LetterJay
|
a0cf777040
|
Merge branch 'master' into upstream-merge-29940
|
2017-08-21 23:29:24 -05:00 |
|
CitadelStationBot
|
87b3df3069
|
Replace all secondary flags with bitflags stored in the flags_2 var
|
2017-08-17 09:19:14 -05:00 |
|
CitadelStationBot
|
4d19a89519
|
Removes a great amount of machinery copypasta with circuitboards.
|
2017-08-09 19:24:19 -05:00 |
|
CitadelStationBot
|
dd22c79678
|
Completes major inhand split project (#2178)
|
2017-08-02 06:30:33 -05:00 |
|
CitadelStationBot
|
ff6bbbedf5
|
Changes some 1s and 0s to TRUE and FALSE (#1967)
|
2017-07-10 16:13:16 -07:00 |
|
CitadelStationBot
|
90c2a4f867
|
Removes now-unnecessary obj_integrity definitions
|
2017-07-09 19:44:48 -05:00 |
|
CitadelStationBot
|
01cd2039e5
|
Changes investigate logs to use a define
|
2017-05-22 22:45:54 -05:00 |
|
CitadelStationBot
|
6a2916a171
|
[MIRROR] Bluespace Launchpads (#879)
* Bluespace Launchpads
* Delete runtimestation.dmm.rej
* Delete tgstation.dme.rej
* Delete tgui.js.rej
* Update tgui.js
|
2017-05-18 07:12:13 -05:00 |
|