Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
kevinz000
|
e7331b3c98
|
Merge pull request #8571 from Thalpy/Dwarf
Medical smartdarts.
|
2019-06-23 06:24:10 -07:00 |
|
Ghom
|
41bd3caf3c
|
Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."
* Unbent codex, singing the sorrow of aborted spoils.
* .
|
2019-06-23 06:00:27 -07:00 |
|
Fermi
|
095ea1243b
|
Fits better.
|
2019-06-19 00:39:38 +01:00 |
|
Fermi
|
f5c98f5d57
|
Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf
|
2019-06-19 00:17:30 +01:00 |
|
Fermi
|
fe6296b58a
|
Added crafting recipies as per Bhijin's request.
|
2019-06-19 00:17:18 +01:00 |
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
Thalpy
|
1cc0724519
|
Merge branch 'master' into Dwarf
|
2019-06-17 12:09:55 +01:00 |
|
deathride58
|
b487b0103b
|
Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
|
2019-06-16 22:52:47 -04:00 |
|
kevinz000
|
28ca8dee46
|
Merge pull request #8648 from Trilbyspaceclone/patch-178
Buffs uplink kits
|
2019-06-16 19:47:09 -07:00 |
|
kevinz000
|
78c969a9cb
|
Merge pull request #8584 from Trilbyspaceclone/patch-172
Organ Storage box
|
2019-06-16 19:43:10 -07:00 |
|
kevinz000
|
9e85eb5757
|
Merge pull request #8618 from Trilbyspaceclone/Magless
Corrects ammo boxes spawning, as well as buffs cargo shotgun crates
|
2019-06-16 19:29:04 -07:00 |
|
kevinz000
|
12ecaf63ee
|
Merge pull request #8605 from Trilbyspaceclone/patch-174
Adds medical breifcases
|
2019-06-16 01:11:11 -07:00 |
|
Trilbyspaceclone
|
c0d3ddceeb
|
Update uplink_kits.dm
|
2019-06-15 22:59:24 -04:00 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
TrilbySpaseClone
|
3cebb1e807
|
Worked?
Yay?
|
2019-06-10 22:59:36 -04:00 |
|
Sishen
|
13853ac6bf
|
removes family gavel, readds briefcase
|
2019-06-10 10:16:32 -04:00 |
|
Trilbyspaceclone
|
e6e5e62db2
|
Update briefcase.dm
|
2019-06-09 11:50:47 -04: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 |
|
kevinz000
|
b69986e544
|
Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements
Arcade Loot Improvements + Battlemachine Tweaks
|
2019-06-08 03:53:13 -07:00 |
|
kevinz000
|
2cda2380f6
|
durasteel toolboxes
|
2019-06-08 03:50:22 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
kevinz000
|
a37bf5bfaf
|
Merge pull request #8541 from Trilbyspaceclone/patch-164
Adds implanter and implanter cases to syndie surgery bags
|
2019-06-08 01:21:28 -07:00 |
|
kevinz000
|
80aa303b4e
|
Merge pull request #8501 from Trilbyspaceclone/boxen
Colored boxes, more box icons, and more craftable box types!
|
2019-06-08 01:10:11 -07:00 |
|
Fermi
|
b6788cdd64
|
Updated projectile sprite.
|
2019-06-08 01:45:32 +01:00 |
|
Fermi
|
26e55a7a42
|
Swapped stacking to FALSE
|
2019-06-08 01:40:13 +01:00 |
|
Fermi
|
f44b9048af
|
Added to vendors/tech.
|
2019-06-08 01:00:51 +01:00 |
|
Fermi
|
000b930811
|
Added Medolier (needs sprite)
|
2019-06-07 00:19:28 +01:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
Trilbyspaceclone
|
03132569a7
|
Update backpack.dm
|
2019-06-05 15:54:51 -04:00 |
|
BurgerLua
|
e7802a9b03
|
Arcade Loot Improvements
|
2019-06-02 02:02:47 -07:00 |
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|
Trilbyspaceclone
|
9badda96d8
|
huh
|
2019-05-31 18:04:02 -04:00 |
|
Trilbyspaceclone
|
5e67974611
|
old file fixing
|
2019-05-31 18:01:22 -04:00 |
|
Trilbyspaceclone
|
96a32f7c3d
|
Update boxes.dm
|
2019-05-31 17:53:54 -04:00 |
|
Trilbyspaceclone
|
5d80fb6811
|
Update backpack.dm
|
2019-05-30 15:04:45 -04:00 |
|
Fermi
|
91f10442cf
|
Merge branch 'pr/12'
|
2019-05-26 02:05:48 +01:00 |
|
Trilbyspaceclone
|
b6590cd9e9
|
Update boxes.dm
|
2019-05-25 17:54:57 -04:00 |
|
Trilbyspaceclone
|
c9f6b02a0e
|
Update briefcase.dm
|
2019-05-12 21:23:40 -04:00 |
|
kevinz000
|
9b135ed56b
|
Merge pull request #8338 from Sishen1542/satchel-holding
Satchel of Holding!
|
2019-05-11 22:14:15 -07: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 |
|
Trilbyspaceclone
|
4c0caa3aae
|
Update toolbox.dm
|
2019-05-10 14:51:49 -04: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 |
|
Sishen
|
c3df1b354e
|
Satchel of holding
fashion creep
|
2019-05-09 20:44:07 -04:00 |
|
BurgerLua
|
1557c33008
|
Adds Penis Enlargement Pills
|
2019-05-02 14:55:04 -07:00 |
|