Ghom
|
f24c7fb142
|
Merge pull request #11222 from Trilbyspaceclone/ashwalkers
Ashwalkers now can make a well, got their livestock back and more!
|
2020-03-06 13:48:03 +01:00 |
|
kevinz000
|
0ace3f2310
|
Update buffing.dm
|
2020-03-06 05:42:28 -07:00 |
|
Trilbyspaceclone
|
178de5ee0d
|
Merge branch 'master' into more_crates+bags
|
2020-03-06 06:31:54 -05:00 |
|
Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +01:00 |
|
monster860
|
4a108d7a9a
|
fixes oopsie
|
2020-03-06 04:40:22 -05:00 |
|
monster860
|
86baaf3710
|
Pixel shifting for ERP
|
2020-03-06 04:31:46 -05:00 |
|
kevinz000
|
3af4862be6
|
Update pool_controller.dm
|
2020-03-06 02:09:39 -07:00 |
|
kevinz000
|
62d2acf94f
|
Update slime.dm
|
2020-03-06 02:06:42 -07:00 |
|
kevinz000
|
87c869a735
|
Update carbon.dm
|
2020-03-06 02:00:19 -07:00 |
|
kevinz000
|
6db3a23828
|
Update belly_obj.dm
|
2020-03-06 01:44:45 -07:00 |
|
kevinz000
|
4d9c92c317
|
Update mob.dm
|
2020-03-06 01:39:16 -07:00 |
|
kevinz000
|
ae97cec8b4
|
Merge pull request #11309 from Citadel-Station-13/Ghommie-patch-1
The lavaland elite tumor shard revival now fetches the mob's ghost.
|
2020-03-06 00:20:18 -07:00 |
|
kevinz000
|
d376b99af6
|
Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
|
2020-03-06 00:19:51 -07:00 |
|
kevinz000
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
kevinz000
|
23fa750e31
|
Merge pull request #11324 from Trilbyspaceclone/patch-302
Makes medical hardsuits have built in huds
|
2020-03-06 00:17:09 -07:00 |
|
kevinz000
|
78b1dcaae4
|
Merge pull request #11330 from Citadel-Station-13/Ghommie-patch-4
Allows blobbernauts to drag objects (but not mobs) again.
|
2020-03-06 00:14:43 -07:00 |
|
kevinz000
|
9420424c8f
|
Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-06 00:14:13 -07:00 |
|
deathride58
|
e08669e8a1
|
Ports Virgo's synthetic taursprites, adds taur to synthliz mutant bodyparts
|
2020-03-06 00:15:37 -05:00 |
|
Ghom
|
5c67c71e90
|
Update towercap.dm
|
2020-03-06 05:41:49 +01:00 |
|
Ghom
|
b80acdfaa6
|
Update glass.dm
|
2020-03-06 05:39:18 +01:00 |
|
deathride58
|
ee65f070bf
|
fixes runtime with body markings
|
2020-03-05 23:22:56 -05:00 |
|
Ghommie
|
0c4af362bc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605
|
2020-03-06 04:00:36 +01:00 |
|
Ghommie
|
e484f72d7b
|
Ports movespeed modifiers code updates.
|
2020-03-06 03:35:56 +01:00 |
|
Crystal9156
|
adc965d55e
|
Fixes Chocolate Jelly Donuts
Choco Jelly Donuts's icon_state is actually jelly_choco, it /was/ jelly_choc which is incorrect as the dmi says jelly_choco
|
2020-03-05 20:52:09 -05: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 |
|
Ghom
|
5e603c1cce
|
Merge pull request #11064 from Trilbyspaceclone/more_implants
3 new arm tool set implants
|
2020-03-06 01:25:02 +01:00 |
|
Ghom
|
44a9add328
|
Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
Removed unused techweb var - Cargo selling of Techwebs nodes
|
2020-03-06 01:21:09 +01:00 |
|
Ghommie
|
324f75c4db
|
Makes the thing actually work.
|
2020-03-05 21:41:41 +01:00 |
|
Ghommie
|
6de290758b
|
Oh, yea.
|
2020-03-05 19:07:24 +01:00 |
|
Ghommie
|
2cbdae2f0a
|
Made flavor texts into an element datum.
|
2020-03-05 18:46:33 +01:00 |
|
kevinz000
|
5bca5690c4
|
ok
|
2020-03-05 01:00:35 -07:00 |
|
kevinz000
|
e027d22fd8
|
eh ok
|
2020-03-05 00:53:18 -07:00 |
|
kevinz000
|
032b973d82
|
wow that's a lot of effort
|
2020-03-05 00:51:05 -07:00 |
|
kevinz000
|
76541ff57a
|
getting worse
|
2020-03-05 00:16:22 -07:00 |
|
deathride58
|
c5109fa31a
|
addresses review
|
2020-03-04 21:04:34 -05:00 |
|
Ghommie
|
bb7bfc04cc
|
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-05 01:47:04 +01:00 |
|
kevinz000
|
b718e0e0d6
|
fuck
|
2020-03-04 16:46:09 -07:00 |
|
Ghom
|
68273d0211
|
Merge pull request #11218 from Seris02/nomoreailipreading
no more ai illegal upgrades, version 2 because I forgot I made it in web browser last time
|
2020-03-05 00:26:12 +01:00 |
|
Ghom
|
5e4f8dc6a0
|
Merge pull request #11181 from Detective-Google/big-chode-energy
changes sausage girth from circumference -> diameter
|
2020-03-04 23:49:58 +01:00 |
|
kevinz000
|
8d1e36e076
|
k
|
2020-03-04 15:49:47 -07:00 |
|
Ghom
|
d78cdb9b37
|
Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
|
2020-03-04 23:46:10 +01:00 |
|
kevinz000
|
d1f161fe0f
|
changes
|
2020-03-04 15:42:01 -07:00 |
|
Ghom
|
c373323690
|
Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
fix nose booping
|
2020-03-04 23:40:54 +01:00 |
|
Ghom
|
9eedf8c1fb
|
Update blob_mobs.dm
|
2020-03-04 23:34:59 +01:00 |
|
Ghom
|
ec5449b349
|
Merge pull request #11327 from Arturlang/dropper_fix
Fixes reagent containers transfer cycling
|
2020-03-04 23:17:00 +01:00 |
|
Ghommie
|
065a5743a0
|
Toy guns.
|
2020-03-04 22:59:55 +01:00 |
|
Ghom
|
17488480b1
|
Allows blobbernauts to drag objects (but not mobs) again.
|
2020-03-04 22:43:30 +01:00 |
|
TrilbySpaceClone
|
7e51cf9ab3
|
Removed unused techweb var
|
2020-03-04 16:30:10 -05:00 |
|
Artur
|
f879316b4e
|
All it lacked is a return.
|
2020-03-04 23:29:08 +02:00 |
|
Ghommie
|
4ff63b7791
|
Made laser carbines and magrifles bulkier.
|
2020-03-04 22:28:02 +01:00 |
|