Letter N
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Hatterhat
d8f5acfa22
i despise cargocode
2020-08-13 13:09:41 -05:00
Trilbyspaceclone and GitHub
c6c4d61ee3
Cargo Rework - MK *why did I ever lison to people that were just powergamers?* ( #11975 )
...
* Baby wheels off
* Oh god factorio is dead!
* Gas-p the nerfs!
* Update gear.dm
* tools
* Update large_objects.dm
2020-05-15 03:57:28 +02:00
Artur
ddcfcb5cd8
Conflicts sure are !!FUN!!
...
Also adds dolphin gloves to the glove crate, and fixes fortitude
2020-04-15 12:33:59 +03:00
Artur
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
Artur
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
necromanceranne
0c46c151f9
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
2020-04-03 19:42:25 +11:00
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
Ghommie
5875f2578c
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01:00
TrilbySpaceClone
63cb466360
MK II
2019-10-26 18:59:34 -04:00
TrilbySpaceClone
f0a1d44503
Part 1
...
The food brake
2019-08-28 16:54:10 -04:00
deathride58 and kevinz000
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
LetterJay and kevinz000
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
LetterJay
35a1723e98
initial commit - cross reference with 5th port - obviously has compile errors
2016-07-03 02:17:19 -05:00