shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,627 Commits 5 Branches 0 Tags
6db5655ceb8d272db8ddc8bdabb60e57d52cf749
Commit Graph

21989 Commits

Author SHA1 Message Date
Detective-Google
6db5655ceb Merge branch 'master' into 91-files-changed-fml 2020-05-02 17:16:18 -05:00
Lin
f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows 
Electrochromatic (dim-on-demand) windows
 2020-05-02 19:13:29 +00:00
Ghommie
42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie
7ae2615f51 Whops. 2020-05-02 19:13:21 +02:00
Ghommie
c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
Putnam3145
c1d1e4f0c0 Properly closes some bold tags. (#12088) 
* Fixes some unmatched <b>s

* remember to ctrl+s
 2020-05-02 14:53:17 +02:00
Detective Google
2290deb9d7 fixes snowlegion portals dropping proper legions instead of skeles 2020-05-01 22:23:19 -05:00
Detective Google
8839e1beaa makes the wendigo screech shake not completely aids 2020-05-01 22:02:54 -05:00
Detective Google
7d4e4e24d6 Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work 2020-05-01 21:58:32 -05:00
Detective Google
13aa536027 makes the wendigo fight have the same atmos as the surrounding icemoon 2020-05-01 20:13:53 -05:00
DeltaFire15
21c9c98412 > & < agony (#12082) 
hm yes today a check being the wrong way will break exo nanites.
 2020-05-02 00:36:03 +02:00
kevinz000
d678970872 Merge pull request #12068 from zeroisthebiggay/fuckshitasstits 
quick hosion mode buff
 2020-05-01 14:52:50 -07:00
kevinz000
ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697 
toylathe copypasta removal and preparations for economy public lathe nerf.
 2020-05-01 14:52:29 -07:00
Ghommie
54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
kevinz000
f99d904dc7 ports /tg/station vis_flags related fixes (#12064) 
* fixes

* Update layers_planes.dm

* kay
 2020-05-01 21:14:04 +02:00
kevinz000
44f9773ccf Merge pull request #12077 from Ghommie/Ghommie-cit714 
Stops organs from turning against owners in cold environments and freezers.
 2020-05-01 11:50:29 -07:00
Detective Google
d85c24680d wendigos can't runtime when butchering if you can't butcher them 😎 2020-05-01 13:22:16 -05:00
Putnam3145
3fc4416680 Buffs medbots massively. (#12058) 
* Buffs medbots massively.

* Reverted the previous buff slightly.

* Update code/modules/mob/living/simple_animal/bot/medbot.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-01 18:50:22 +02:00
Psody-Mordheim
030201e5de Two lines (#12071) 2020-05-01 18:42:01 +02:00
kevinz000
269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
BlackMajor
d0a3b86d7b Fix wormholes event flinging people into asteroids. (#11946) 
* Update wormholes.dm

* Update code/modules/events/wormholes.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/events/wormholes.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-01 18:27:39 +02:00
Putnam3145
0019b5a742 Game info verb for ghosts (#11935) 
* Some ghost QoL stuff

* DNR/observer only
 2020-05-01 18:02:00 +02:00
Arturlang
16b172c178 Fixes and tweaks for bloodsuckers (#12055) 
* Tweaaakkksss

* Tweaks and stuff

* Compile
 2020-05-01 18:00:15 +02:00
Arturlang
53395171e1 Fixes vendors some (#12056) 2020-05-01 17:59:04 +02:00
kevinz000
2335fd3ca6 kay (#12060) 2020-05-01 17:57:53 +02:00
Ghommie
3715f95650 Stops organs from turning against you in cold environments and freezers. 2020-05-01 16:56:33 +02:00
Detective Google
7ef5246b19 fixes a bunch of mismatch atmos in ruins 2020-05-01 01:33:14 -05:00
Detective Google
2832b86e11 some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life 2020-05-01 01:17:56 -05:00
Detective Google
231fd0edea fixes the stupid fucking tile placing list 2020-04-30 23:04:35 -05:00
Detective Google
c911d81cdc fixes the volanic subtypes of the other thing 2020-04-30 21:21:59 -05:00
Detective Google
6316b02e68 unfucks changeturf for the more_caves 2020-04-30 21:17:41 -05:00
Detective Google
9c049ef02b more mapping fixes 2020-04-30 21:02:31 -05:00
kevinz000
c9cd134132 linter fix 2020-04-30 17:39:30 -07:00
Detective Google
df2b622007 nukes the SpawnTerrain proc used for tg geysers 2020-04-30 19:34:27 -05:00
Detective-Google
c146c898c0 Merge branch 'master' into 91-files-changed-fml 2020-04-30 18:42:38 -05:00
Detective Google
41d1dd1763 fixes the maps 2020-04-30 18:13:02 -05:00
ZeroMan
438a83b5c0 a 2020-04-30 17:56:07 -04:00
Detective Google
f6736e862d it compiles, now to fix the maps 2020-04-30 15:49:06 -05:00
ZeroMan
52b7086876 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-04-30 13:48:48 -04:00
Lin
7784f5efa1 Merge pull request #12034 from Citadel-Station-13/kevinz000-patch-7 
Maybe fixes vehicles blocking projectiles
 2020-04-30 17:41:07 +00:00
Lin
c4250a41d2 Merge pull request #12017 from kevinz000/skills 
Implements a basic skill system + adds surgery skill
 2020-04-30 17:39:21 +00:00
kevinz000
aedecc5f0b Merge pull request #12031 from Trilbyspaceclone/cleanbot 
Cleanbot
 2020-04-30 10:37:37 -07:00
kevinz000
061265981d Merge pull request #12052 from deathride58/fixescheetowalkers 
fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade"
 2020-04-30 10:37:23 -07:00
kevinz000
02265010d6 fixes 2020-04-30 10:07:17 -07:00
kevinz000
7e8ebfde83 whew 2020-04-30 10:03:35 -07:00
kevinz000
034499f356 new stuff 2020-04-30 09:59:08 -07:00
kevinz000
8dae739d8f fixes 2020-04-30 01:39:38 -07:00
kevinz000
615dc71069 fixes 2020-04-30 01:26:46 -07:00
kevinz000
bd7b1b1193 fixes 2020-04-30 01:23:21 -07:00
kevinz000
9d753fe74f Update damage_procs.dm 2020-04-30 01:07:10 -07:00