Ghommie
|
de531bd047
|
porting CEV-Eris pickweight procs.
|
2020-04-23 21:47:54 +02:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
kevinz000
|
ff651ac881
|
Merge pull request #11931 from Ghommie/Ghommie-cit694
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-20 11:31:31 -07:00 |
|
Ghommie
|
d5a43be181
|
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-19 03:07:45 +02:00 |
|
kevinz000
|
7756682362
|
Merge pull request #11774 from Trilbyspaceclone/tools_andstuff
More mapping Loot tables and code improvements + Maints/Locker loot changes
|
2020-04-17 05:51:26 -07:00 |
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
Ghommie
|
571584901c
|
Custom skin tone preferences.
|
2020-04-14 19:10:28 +02:00 |
|
Trilbyspaceclone
|
34397a5d17
|
Update lootdrop.dm
|
2020-04-14 10:13:23 -04:00 |
|
Trilbyspaceclone
|
5833ed8029
|
Merge branch 'master' into tools_andstuff
|
2020-04-14 10:10:32 -04:00 |
|
Ghom
|
23b45c9cf3
|
Update lootdrop.dm
|
2020-04-12 06:54:40 +02:00 |
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03:00 |
|
Trilbyspaceclone
|
d6c819cad2
|
Update lootdrop.dm
|
2020-04-07 09:20:18 -04:00 |
|
TrilbySpaceClone
|
1f51e73dd6
|
more rng
|
2020-04-07 08:43:18 -04:00 |
|
kevinz000
|
ef2eaf2233
|
Merge pull request #11753 from KathrinBailey/Small-&-Snug-Changes
They put me in a padded cell for spriting and porting.
|
2020-04-07 01:56:21 -07:00 |
|
KathrinBailey
|
adeb61180c
|
big floof
|
2020-04-06 01:09:25 +01:00 |
|
Trilbyspaceclone
|
99bf1da408
|
your to you
|
2020-04-04 10:37:37 -04:00 |
|
TrilbySpaceClone
|
10ca01cc95
|
effort
|
2020-04-04 09:30:24 -04:00 |
|
Putnam3145
|
ede3379a87
|
Merge pull request #11719 from Ghommie/Ghommie-cit662
Intellectual property infringment is not cool.
|
2020-04-02 06:18:41 -07:00 |
|
Ghommie
|
e50fe8b061
|
Removing a trademark from the game.
|
2020-04-02 14:48:43 +02:00 |
|
actioninja
|
abde27c098
|
layer changes
|
2020-03-28 23:50:08 -07:00 |
|
kevinz000
|
ea7c1058b5
|
Merge pull request #11524 from Ghommie/Ghommie-cit627
More or less ports "Clothing /under repath"
|
2020-03-23 10:40:31 -07:00 |
|
keronshb
|
830f646383
|
Revert "Merge pull request #11225 from r4d6/Random-Mining"
This reverts commit ea5774e713.
|
2020-03-22 15:55:08 -04:00 |
|
Ghommie
|
86898cc451
|
Force pushed updates
|
2020-03-22 01:43:19 +01:00 |
|
kevinz000
|
4eaa3a22c2
|
fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging (#11528)
* wew
* ah
* k
* k
* faster
|
2020-03-21 02:45:34 +01:00 |
|
Ghommie
|
1d51ac5ff2
|
Fixing some bug reports.
|
2020-03-14 02:34:25 +01:00 |
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
kevinz000
|
dac74ccf2d
|
Merge pull request #11331 from Ghommie/Ghommie-cit602
Fixing one hell of a gibs runtime.
|
2020-03-06 00:14:28 -07:00 |
|
deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Ghommie
|
d4af57b0a9
|
Fixing one hell of a gibs runtime.
|
2020-03-05 01:02:54 +01:00 |
|
Ghom
|
8c6b5b49c5
|
Update contraband.dm
|
2020-03-04 15:39:23 +01:00 |
|
kevinz000
|
6354b48659
|
fix
|
2020-03-03 20:58:06 -07:00 |
|
KathrinBailey
|
97733e464d
|
ghommie change and armrest bug fix
|
2020-03-04 01:35:00 +00:00 |
|
KathrinBailey
|
7e0abda3c1
|
fixing merge conflicts
includes trillby's new posters.
|
2020-03-03 13:56:01 +00:00 |
|
Ghom
|
f9a2326437
|
Merge pull request #11203 from Trilbyspaceclone/poster
Three new posters!
|
2020-03-03 13:29:54 +01:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Trilbyspaceclone
|
12ea1132c4
|
Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-01 00:43:34 -05:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
r4d6
|
f76a1c15f3
|
Port random mining base
|
2020-02-24 13:27:54 -05:00 |
|
TrilbySpaceClone
|
6a8c874779
|
Three new posters!
|
2020-02-22 17:38:25 -05:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08:00 |
|
Seris02
|
84d08fe122
|
firebreath change + update to tg genetics + calc patch
|
2020-02-22 19:42:33 +08:00 |
|
Detective Google
|
4c10c830bf
|
Merge remote-tracking branch 'upstream/master' into psych+paramedic
|
2020-02-20 22:17:55 -06:00 |
|
Detective Google
|
a8f863f901
|
changes - sprites
|
2020-02-20 22:17:47 -06:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +01:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|