Ghommie
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
nik707
63dd3487b3
Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
...
the one where the combat medic kit gets buffed
2019-12-19 14:11:27 -06:00
Hatterhat
a1cc129d0b
slightly better storage, cucks the surgery duffel
2019-12-13 21:10:12 -06:00
Hatterhat
6ff7083bfb
the one where i buff a 4 tc item, give trilby a (You), and squash my commits
2019-12-08 01:29:08 -06:00
Ghommie
f5b4d6a0ad
Oh bummers.
2019-11-29 07:27:05 +01:00
Ghommie
9b8ed8ca4f
The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs.
2019-11-29 07:14:51 +01:00
Ghommie
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
Thalpy
41eee65b15
Merge branch 'master' into master
2019-06-17 12:18:40 +01:00
Trilbyspaceclone
60e89a6ca4
wrong w_class
2019-06-08 16:19:16 -04:00
Trilbyspaceclone
a86d6fd9cc
Update firstaid.dm
2019-06-08 16:06:36 -04:00
Fermi
ddad7a173d
All compiling errors fixed!! I did it!!
2019-05-11 15:47:58 +01:00
Fermi
f7655cad25
All compiling errors fixed, except for a few weird ones that I need help
2019-05-11 15:40:06 +01:00
Thalpy
926bd65392
Merge branch 'master' into FermiChem
2019-05-11 14:14:20 +01:00
Fermi
29d4a2fdde
Finished MCchem, now to fix compling errors.
2019-05-11 00:14:04 +01:00
Fermi
cb0e50be0a
Missed / in last pr
2019-05-10 03:12:28 +01:00
Fermi
ac8b7be45c
Merges old penis enlargement pills into prexisiting Fermichem ones. (master ( #8319 ) by BurgerLUA)
2019-05-10 03:10:42 +01:00
BurgerLua
1557c33008
Adds Penis Enlargement Pills
2019-05-02 14:55:04 -07:00
Trilbyspaceclone
9ab2bf3860
+ <-- BAD
2019-04-04 16:28:18 -04:00
Trilbyspaceclone
003dd6d93d
+ is bad I guess
2019-04-04 15:53:36 -04:00
Trilbyspaceclone
f92ba3714d
Grammar fix
2019-04-04 13:58:21 -04:00
Trilbyspaceclone
76c952cd6f
Update firstaid.dm
2019-04-04 13:57:15 -04:00
Trilbyspaceclone
7a2088aba6
Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall ( #7974 )
...
* Update utility_closets.dm
* Update firstaid.dm
* Update pill.dm
* Update hypospray.dm
* Update firstaid.dm
* Update pill.dm
2019-02-13 20:46:55 -08:00
Tlaltecuhtli
01eb1bc7fe
[READY] better contraband crates ( #38321 )
...
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-21 18:52:15 -05:00
kevinz000
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
Poojawa
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
MrDoomBringer
4d206f56e8
Adds ~70 more suicides
2018-01-23 01:39:07 -06:00
Jordan Brown
70be12aa1c
Merge pull request #33241 from swindly/suicide
...
Adds some suicide acts
2017-12-09 15:52:53 -06:00
CitadelStationBot
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
