LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
67c6cc3fc0
tiny fix
2021-10-27 13:48:34 -03:00
SandPoot
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
SandPoot
17986fea3f
cannot escape
2021-10-16 14:24:22 -03:00
SandPoot
1561138350
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-16 14:11:00 -03:00
Lin
1f7e65ad01
Merge pull request #15271 from Citadel-Station-13/admin_tickets
...
fixes "answered by <admin>" spam in irc
2021-10-15 23:34:15 -07:00
silicons
d0eade8fe1
fix
2021-10-14 19:20:32 -07:00
DeltaFire
5680b74294
safety
2021-10-11 20:32:00 +02:00
DeltaFire
66e81e7fda
asay ping time
2021-10-11 19:52:30 +02:00
SandPoot
437b3105d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-08 21:05:41 -03:00
Putnam3145
3cfaad31c1
Merge pull request #15149 from keronshb/dynamicport
...
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
silicons
0a75925df9
wack
2021-09-29 06:02:17 -07:00
keronshb
c8814e8cc8
Merge remote-tracking branch 'upstream/master' into dynamicport
2021-09-19 18:09:18 -04:00
zerothebigboy
c6ce359cda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-09-19 15:23:52 -04:00
keronshb
6cc4e35b44
Mob lists
2021-09-19 13:28:41 -04:00
keronshb
792dc073b3
Final fixes?
2021-09-16 13:28:34 -04:00
keronshb
7ed5f622f4
Dynamic
2021-09-14 19:33:17 -04:00
LetterN
1ba8f25410
byond no likey :(
2021-09-08 10:35:41 +08:00
LetterN
e94725344b
extool based reftracking
2021-09-08 10:30:35 +08:00
LetterN
12ae614833
fix1
2021-09-08 10:22:55 +08:00
LetterN
6739e349a0
heretics LOVES this - Also ian's birthday!
2021-09-08 09:50:07 +08:00
zerothebigboy
06181f51ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
zerothebigboy
fb32aa1248
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-06-20 03:29:50 -04:00
Putnam3145
dbdc3001ba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-16 23:33:14 -07:00
silicons
2c61a48860
Update mark_datum.dm
2021-06-12 05:09:13 -07:00
Putnam
833d34ba8e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-11 16:28:12 -07:00
Putnam
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07:00
zerothebigboy
1a90c96e4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# icons/mob/clothing/feet.dmi
# icons/mob/clothing/feet_digi.dmi
# icons/mob/clothing/head.dmi
# icons/mob/clothing/mask.dmi
# icons/mob/clothing/mask_muzzled.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/masks.dmi
# icons/obj/items_and_weapons.dmi
2021-06-09 17:40:28 -04:00
silicons
eb4b4088f4
Merge pull request #14760 from keronshb/floorcluwneport
...
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
Putnam
86177c51c4
auxgm part 1
...
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
Putnam
0dc1163a29
adds a sorely needed line break
2021-05-30 00:44:02 -07:00
Putnam
1c17570ea8
works but leaks
2021-05-30 00:28:51 -07:00
keronshb
8f1db2d5ec
Fixes some stuff
...
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
keronshb
78db6bd5c2
Ports Floor Cluwnes
...
Oh fuck oh god
2021-05-26 21:58:35 -04:00
keronshb
9e3c1ff860
adds floor cluwnes from yog
2021-05-24 22:46:59 -04:00
zerothebigboy
bd186d25cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
2021-05-23 15:29:20 -04:00
Putnam
e580c504fa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-05-21 18:52:16 -07:00
Lin
acb2177a85
Merge pull request #14732 from Citadel-Station-13/silicons-patch-32
...
adds _contents() wrapper for SELECT SDQL2 statements
2021-05-19 14:50:18 -05:00
silicons
780a579c7b
Update SDQL_2_wrappers.dm
2021-05-17 12:20:15 -07:00
timothyteakettle
34869215e8
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-14 01:59:32 +01:00
silicons
5601badbff
deterministic explosion system ( #13392 )
...
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
2021-05-12 05:44:53 -05:00
Putnam
6c8fa56132
Adds make priority announcement verb
2021-05-06 15:10:36 -07:00
Timothy Teakettle
3c7137f951
what if we didnt break 90% of the game
2021-05-05 18:19:02 +01:00
zerothebigboy
359c778955
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
silicons
47489c21d6
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
2021-04-27 00:59:45 -07:00
SandPoot
90661d3687
upload files
2021-04-24 21:37:01 -03:00
