Mosley
0d9eebd20c
Merge remote-tracking branch 'upstream/master'
2025-04-24 17:03:15 -05:00
SandPoot
06572b5e20
cover holes
2025-04-18 18:30:23 -03:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
SandPoot
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
BongaTheProto
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
BongaTheProto
57a7a516e6
Merge remote-tracking branch 'upstream/master'
2023-03-06 22:43:10 -05:00
zerothebigboy
8dd5986788
okay
2023-01-30 00:06:49 -05:00
zerothebigboy
091d9ec00f
good
2023-01-30 00:01:22 -05:00
Toxici11i
a9d1d540cf
Swussy?
2022-05-08 21:49:47 +01:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
BongaTheProto
9ce527e068
Merge remote-tracking branch 'upstream/master'
2022-01-26 00:20:29 -05:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
BongaTheProto
b739ecf189
Merge branch 'master' into protect-dorms
2021-12-08 21:34:51 -05:00
BongaTheProto
bf8cccee6e
Update radiation_storm.dm
2021-12-08 14:35:38 -05:00
Lin and GitHub
76fbc0994f
ball map weather ( #15405 )
2021-12-08 18:49:43 +01:00
keronshb
af83fb9611
FestiveMap 2021
2021-11-20 12:04:35 -05: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
Chayse Ramsay and GitHub
d1611ddf42
Lavaland ruin rad storm fix ( #15242 )
...
* Lavaland rad storm fix
* whoops
* double whoops
* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
zerothebigboy
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
LetterN
292f67e098
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-20 20:36:56 +08:00
kiwedespars
69d927e756
Merge branch 'master' into void-but-for-real
2021-03-12 23:10:19 -08:00
Letter N
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
kiwedespars
3ce6459aef
void heretic and many other prs
2021-03-09 02:58:34 -08:00
Putnam
311d766bd5
Adds a supernova event, with tweaks to allow this
2021-02-24 02:56:14 -08:00
silicons
e7220e842e
things
2020-09-15 15:29:34 -07:00
silicons
42db990836
why am i doing this
2020-08-03 13:37:37 -07:00
Detective Google
948081fdce
outdoor lights, rad protection
2020-05-12 17:13:23 -05:00
kevinz000
bd7b1b1193
fixes
2020-04-30 01:23:21 -07:00
Detective Google
71be8ed2fc
ports all the tg junk for icemoon, not yet changed to make it all compile
2020-04-24 00:02:03 -05:00
0e3193e929
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important ( #11376 )
...
* combat refactoring
* i hate this
* mobility flags part 2 time xd
* whew
* stuff
* a
* ok
* changes
* Wew
* k
* add flags
* FUCKYOUVORE
* fixes
* typo
* no using this in hard stamcrit
* update icon
* woopsy
* . = ..()
* sigh
* Update living_combat.dm
* wew
* wups
* fix
* i hate you
* wrong button
* k
* ok
* bet
* k
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* early returns
* skreee
* agony
* k
* k
* k
* k
* wack
* compile
* wack
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-21 16:04:26 +01:00
BlackMajor
43e77f7d3a
Last few fixes. Adds arcane wand to dead wizard roid.
2020-03-04 19:12:56 +13:00
kevinz000
d8d6a8efb8
lazy-be-gone
2020-02-12 02:15:56 -07:00
kevinz000
33b3d06d4c
im lazy
2020-02-12 01:44:28 -07:00
Ghommie
5644617786
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
2020-01-20 20:59:38 +01:00
Ghom and GitHub
4016835b0a
Merge pull request #9798 from Citadel-Station-13/kevinz000-patch-114
...
Radiation storms no longer do random mutations in of itself, but are far more lethal
2019-12-20 14:32:42 +01:00
Ghommie
19a3aca619
I fear for my powernet
2019-12-10 15:33:15 +01:00
06ae6cde09
Update code/datums/weather/weather_types/radiation_storm.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-14 01:39:42 -07:00
kevinz000 and GitHub
690d6f90ec
Update radiation_storm.dm
2019-11-12 23:50:40 -07:00
kevinz000 and GitHub
53bfbacbe0
Update radiation_storm.dm
2019-11-12 23:48:39 -07:00
kevinz000 and GitHub
d858bd0526
Update radiation_storm.dm
2019-11-12 23:45:47 -07:00
Ghommie
a204fddc4b
Fixing some issues with dullahans.
2019-11-01 18:51:06 +01:00
Poojawa
b5841c718b
Genpop for security
2019-08-07 06:14:35 -05:00
Ghommie
d3d2b8d898
should be ready.
2019-06-06 19:24:20 +02:00
Tupinambis
828b631570
Increased Ash Walker resistances, makes them ash proof. Improves the Base.
2018-12-15 15:33:19 -06:00
Poojawa
b6430559e9
datums
2018-09-11 02:49:41 -05:00
deathride58
91805b8789
and that just leaves the modules folder
2018-07-02 00:28:51 -04:00
Grandmother of 50 and letterjay
023f93f734
Fixes Bedbuckling to avoid Floor is Lava ( #37752 )
...
* Update floor_is_lava.dm
* Pulls the check out of the loop.
2018-05-12 17:44:12 -05:00
Mosley