Sishen
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
Thalpy
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
kevinz000
4f0dc33d1b
Merge pull request #9021 from Ghommie/Ghommie-cit174
...
Ports "Adds techpriest robes and adds them to the RoboDrobe"
2019-08-05 00:49:29 -07:00
TrilbySpaceClone
3a85f9473c
amazing
2019-08-02 14:37:52 -04:00
Ghommie
7c9c51b777
Ports "Adds techpriest robes and adds them to the RoboDrobe"
2019-07-31 21:54:55 +02:00
Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Sishen
68083aa0c6
a
2019-07-25 21:43:02 -04:00
Sishen
612021b9d5
h
2019-07-25 21:43:02 -04:00
Thalpy
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
Ghommie
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
Thalpy
937d6467e6
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
2019-06-30 19:16:27 +01:00
Fermi
79a7b6b45b
Fixes.
2019-05-27 20:25:57 +01:00
Fermi
91f10442cf
Merge branch 'pr/12'
2019-05-26 02:05:48 +01:00
Trilbyspaceclone
65dfca1c18
Update wardrobes.dm
2019-05-16 15:44:59 -04:00
Fermi
246a344fed
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
2019-05-16 00:58:30 +01:00
Trilbyspaceclone
203906781c
Cit change
2018-11-10 00:34:38 -05:00
Trilbyspaceclone
09752d4e2b
Coin for headset with Engi access
2018-11-03 18:46:59 -04:00
deathride58
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
deathride58
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
