Casper3667
|
9f6c524482
|
adds Epsilon Ursae Minoris as a new citizenship type for skrell and diona (#12898)
|
2022-01-19 14:03:33 +01:00 |
|
alberyk
|
8cd6f9ca66
|
Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
# icons/turf/shuttle.dmi
|
2022-01-17 22:20:15 -03:00 |
|
Matt Atlas
|
5bcf84cb23
|
Overmap exoplanet generation, ported from Bay. (#12362)
|
2022-01-17 22:16:48 -03:00 |
|
alberyk
|
cf3b089df4
|
Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
# code/modules/power/breaker_box.dm
|
2022-01-17 19:36:22 -03:00 |
|
Jaraci
|
b55a4e206b
|
Adds Elyran Standard language (#12880)
|
2022-01-17 16:52:00 +01:00 |
|
alberyk
|
1dc3bb2dd8
|
Merge branch 'master' into final_shuttle_touches_and_stuff
|
2022-01-14 21:04:38 -03:00 |
|
Wowzewow (Wezzy)
|
96f1c79d0e
|
Allows painting of padded stools, chairs and beds. (#12855)
|
2021-12-26 21:12:36 +01:00 |
|
alberyk
|
4b32268c1a
|
Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
# code/game/objects/structures/window.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
|
2021-12-21 16:51:40 -03:00 |
|
Werner
|
619ca5ce69
|
Update rust_g to 0.5.0+a2 (#12865)
Co-authored-by: Werner <Arrow768@users.noreply.github.com>
|
2021-12-19 23:22:29 +01:00 |
|
Geeves
|
2003515939
|
Grab Stuff (#12731)
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
|
2021-12-19 22:10:40 +01:00 |
|
Geeves
|
2b11579d92
|
Drone Matrix Things (#12709)
|
2021-11-07 20:30:25 +01:00 |
|
Dekserrrrrr
|
98aeff161f
|
Adds Deksers custom augment (#12615)
|
2021-11-06 12:08:19 +01:00 |
|
desven
|
2e6bd5be02
|
Adds robotic Vaurca limbs (#12706)
* sprites
* code
* changelog
|
2021-11-03 15:13:28 -03:00 |
|
Alberyk
|
3940c6a044
|
Adds nymph-limbs: The Return (#12374)
|
2021-11-01 00:13:15 -03:00 |
|
Alberyk
|
dbebed0075
|
Ports overmap hazards (#12581)
|
2021-10-30 14:22:18 +02:00 |
|
Geeves
|
04b55fb385
|
Pipegun Buff Again (#12507)
|
2021-10-30 13:57:51 +02:00 |
|
alberyk
|
1c9179de7c
|
job stuff
|
2021-10-29 22:01:38 -03:00 |
|
alberyk
|
2294b4f0c5
|
Merge branch 'master' into computer_tweaks
# Conflicts:
# code/game/jobs/faction/eridani.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/civilian_chaplain.dm
# code/game/jobs/job/science.dm
# icons/obj/machines/shielding.dmi
|
2021-10-29 21:41:30 -03:00 |
|
alberyk
|
76544b9cd8
|
rename
|
2021-10-29 21:23:43 -03:00 |
|
Alberyk
|
d5ee7167e5
|
Renames the dionae subspecies also gives them hair (#12693)
|
2021-10-27 23:15:15 -03:00 |
|
Alberyk
|
694577960f
|
Adds a new dionae subspecies (#12649)
|
2021-10-27 13:48:08 -03:00 |
|
Casper3667
|
fb13f6615f
|
Adds sensitive hearing (#12151)
|
2021-10-15 19:02:12 +02:00 |
|
Casper3667
|
df9ed5e3fd
|
Renames skrell species again (#12597)
Co-authored-by: TGW <mc-casper@hotmail.dk>
|
2021-10-13 19:12:25 +02:00 |
|
Alberyk
|
5501c85523
|
Add hammers (#12505)
|
2021-10-11 22:44:59 -03:00 |
|
alberyk
|
09e07fa39e
|
job stuff
|
2021-10-10 22:43:36 -03:00 |
|
alberyk
|
8039138347
|
makes it less eye hurting
|
2021-10-10 21:26:55 -03:00 |
|
alberyk
|
805ffc2f85
|
Merge branch 'master' into computer_tweaks
# Conflicts:
# code/game/jobs/job/ship_crew.dm
|
2021-10-10 13:18:14 -03:00 |
|
Geeves
|
f52d334c0f
|
Fullscreen Mode (#12586)
|
2021-10-10 15:43:53 +02:00 |
|
Casper3667
|
b3f6e913a4
|
Fixes some more cryo spawn bugs (#12594)
Co-authored-by: TGW <mc-casper@hotmail.dk>
|
2021-10-09 13:24:31 -03:00 |
|
Geeves
|
6fed849316
|
Sprite Generation Tweak (#12503)
|
2021-10-05 14:55:31 -03:00 |
|
Casper3667
|
413853786e
|
Preparation for faction departments (#12501)
|
2021-10-01 13:05:21 -03:00 |
|
Casper3667
|
cf3b17f870
|
fixes skrell whitelist (#12560)
|
2021-09-28 12:59:52 -03:00 |
|
Casper3667
|
34990c81d6
|
Adds a new skrell subspecies: Axiori (#12511)
|
2021-09-28 08:02:07 +02:00 |
|
alberyk
|
ae15e82f76
|
All jobs
|
2021-09-23 23:07:28 -03:00 |
|
Geeves
|
fdddb91bd1
|
Event Map Refactor (#12329)
|
2021-09-23 13:34:47 -03:00 |
|
alberyk
|
807769071b
|
Merge branch 'master' into medbay_fixes_and_shit
|
2021-09-22 22:29:51 -03:00 |
|
Geeves
|
cc65070441
|
Drone Speech Refactor and Tweak (#12308)
|
2021-09-13 14:54:41 +02:00 |
|
Matt Atlas
|
b64224770c
|
Ports Bay's updated evacuation controller and bluespace jump. (#12445)
|
2021-09-07 17:12:10 +02:00 |
|
Werner
|
92d164ac09
|
Merge branch 'upstream-master' into placeholder
|
2021-09-07 00:00:37 +02:00 |
|
Matt Atlas
|
fb763d64c0
|
Revert "Pipegun Buff (#12365)" (#12429)
|
2021-08-31 21:56:36 +02:00 |
|
Geeves
|
15aaa4e873
|
Powerful Mechs (#12193)
|
2021-08-31 18:05:09 +02:00 |
|
Geeves
|
6c5e9aa111
|
Pipegun Buff (#12365)
|
2021-08-31 18:05:02 +02:00 |
|
Alberyk
|
056b865be7
|
codethings
|
2021-08-27 00:49:01 -03:00 |
|
Alberyk
|
a013200bab
|
cameras
|
2021-08-26 21:28:07 -03:00 |
|
Alberyk
|
92bbc463b4
|
Merge branch 'master' into bridge_gaming
|
2021-08-24 22:49:24 -03:00 |
|
Matt Atlas
|
e193074f48
|
Addresses limb meta with a few balance changes. (#12348)
|
2021-08-24 18:34:38 +02:00 |
|
Casper3667
|
6dd2102a06
|
Change NT relation into economic status: Round 3 (#11967)
* remakes the economy PR
* SQL migration
* changelog & final migration change
* updates migration
* updates migration
* fixes a stray nt_relation
* updates the database migration
Co-authored-by: TheGreyWolf <mc-casper@hotmail.dk>
|
2021-08-07 13:52:42 +02:00 |
|
Alberyk
|
f66d8b9d83
|
Space Sector: Badlands (#11985)
|
2021-08-05 13:03:49 -03:00 |
|
Geeves
|
421ec26e0a
|
Strong Rezadone (#12221)
|
2021-08-05 13:03:14 -03:00 |
|
Alberyk
|
f5548eb5e3
|
Merge branch 'master' into updates_stuff
# Conflicts:
# code/game/objects/structures/window.dm
|
2021-08-04 23:08:28 -03:00 |
|