cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,165 Commits 8 Branches 26 Tags
549270c73c018ccef20085550aa93feee6da3cd9
Commit Graph

10905 Commits

Author SHA1 Message Date
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
PsiOmegaDelta
967223364d Merge pull request #8988 from mwerezak/droplimb 
Adjusts threshold for limb removal due to damage
 2015-04-26 19:16:34 +02:00
Chinsky
e0c00bda55 Merge pull request #8973 from mwerezak/inventory2 
Inventory updates
 2015-04-26 20:13:21 +03:00
Chinsky
5f30d0fa9a Merge pull request #8982 from PsiOmegaDelta/Bullets 
Adds practice rounds.
 2015-04-26 20:06:37 +03:00
Chinsky
7359562e16 Merge pull request #8905 from PsiOmegaDelta/BorgModules 
Silicon Subsystem update.
 2015-04-26 20:06:21 +03:00
Chinsky
946373f8a0 Merge pull request #8975 from PsiOmegaDelta/Thunderdome 
Custom ambiance music for holodeck programs.
 2015-04-26 20:05:58 +03:00
PsiOmega
fe09ed1a22 Merge remote-tracking branch 'upstream/dev' into BorgModules 
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/mob/living/silicon/ai/subsystems.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_upgrades.dm
 2015-04-26 15:52:18 +02:00
PsiOmega
9df5048dbc Makes it possible for borg modules to include specific subystems. 2015-04-26 15:42:36 +02:00
PsiOmega
e54fbcb9ec Cleans up borg module code and responsibilities. 2015-04-26 12:00:30 +02:00
mwerezak
229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/modules/customitems/item_defines.dm
 2015-04-26 02:04:59 -04:00
mwerezak
b20f604d0c Adjusts threshold for limb removal due to damage 2015-04-26 01:58:52 -04:00
mwerezak
78a02c705b Removes unnecessary and out of place item dropping in human icon code. 2015-04-25 13:55:47 -04:00
mwerezak
4829f1d82d Adds calls to mob_can_unequip() where appropriate 2015-04-25 13:55:24 -04:00
mwerezak
3a00fce32b Refactors mob_can_equip(), adds unequip checks 2015-04-25 13:54:59 -04:00
PsiOmega
4a35631af1 Attempts to save Yosh's code. 2015-04-25 16:39:09 +02:00
PsiOmega
d7bbc6f1c3 Makes it possible to define custom ambiance music for holodeck programs. 
Cleans up holodeck code. Revives an old SS13 track, THUNDERDOME!
 2015-04-25 10:53:14 +02:00
mwerezak
e50043fe99 Updates a few mask body cover flags, allows breath masks to be adjusted in hand 2015-04-24 22:00:51 -04:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
PsiOmegaDelta
ee88da4cea Merge pull request #8966 from Baystation12/master 
Dev
 2015-04-24 09:20:16 +02:00
Chinsky
e0da322ee3 Merge pull request #8956 from mwerezak/gametime 
Makes crit oxyloss and malf AI timer run in gametime instead of realtime.
 2015-04-24 10:03:06 +03:00
Chinsky
2159045b81 Merge pull request #8879 from Dennok/patch-6 
Fix speed and add rotate()
 2015-04-24 10:01:13 +03:00
Zuhayr
24175051a2 Merge pull request #8961 from mwerezak/limb-augments 
Fixes Snapwalk's Limb Augment item being removable through the inventory panel
 2015-04-24 16:15:16 +09:30
mwerezak
0a7fd34f3f Limb augments no longer prevent putting on jumpsuits 2015-04-23 11:27:16 -04:00
mwerezak
7a6a54b671 Fixes Snapwalk's Limb Augment item being removable through the inventory panel 
I haven't heard of any issues on the server about this, but it's probably best to prevent them from being removed.
 2015-04-23 08:25:49 -04:00
mwerezak
f86642a74e Updates clothing/under to use item_state_slots. 
Also fixes a lot of incorrect jumpsuit item_state values.
 2015-04-23 08:03:40 -04:00
PsiOmega
b9f8b0b8aa Re-shuffles huma/say(). Removes non-existing map variables. 2015-04-23 13:36:13 +02:00
PsiOmega
eee67109d1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/say.dm
 2015-04-23 13:15:43 +02:00
PsiOmega
2aa9a70496 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-23 12:59:47 +02:00
mwerezak
3acfe5960e Renames inventory slot string key defines 2015-04-23 04:57:03 -04:00
mwerezak
7a8ae91c6a Makes crit oxyloss and malf AI time run in gametime instead of realtime. 2015-04-23 04:42:58 -04:00
Zuhayr
3fc9260187 Merge pull request #8954 from GinjaNinja32/diona_speech 
Fixes dionaea always using the verb "says".
 2015-04-23 17:02:20 +09:30
mwerezak
1bbb19297e Implements item_state overrides for back slot, hands 
Updates backpacks to use the item_state overrides where necessary, fixes #8577
 2015-04-23 03:26:18 -04:00
GinjaNinja32
07cc28af8e Fixes dionaea always using the verb "says". 
Not sure why, but speech_problem_flag is being set to 1 for dionaea, and only dionaea.
Fixes #8952
 2015-04-23 08:03:07 +01:00
Chinsky
71ffa782c4 Merge pull request #8914 from PsiOmegaDelta/BadMove 
Ensures new players cannot ghost by moving.
 2015-04-23 07:34:34 +03:00
mwerezak
5b037670b3 Removes most instances of item_color 
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
 2015-04-22 17:40:27 -04:00
mwerezak
94c9b9b8ca Adjusts glove siemen coefficients 
Also adjusts jumpsuit rolling to be more amenable to future changes.
 2015-04-22 16:46:14 -04:00
Yoshax
e68f9cec70 Adjusts fruits and stuff to have more juice and stuff. 2015-04-22 15:05:38 +01:00
PsiOmega
4cc524265b Change of random virus targets. 
The random virus event will now only infect mobs on station and which currently have a player that has been active in the last 5 minutes.
Placeholder until a more indepth discussion about what to do about the random event is concluded.
 2015-04-22 12:27:28 +02:00
PsiOmegaDelta
7a27aece0d Merge pull request #8941 from Baystation12/master 
Dev
 2015-04-22 09:32:56 +02:00
Dennok
a65c3a63bc Fix 2015-04-22 09:43:15 +03:00
Dennok
3800db491f get_brake_path() change 
Replace "max(abs(speed[1]),abs(speed[2]))" with "get_speed()"
I think this is more logically.
 2015-04-22 09:27:24 +03:00
Dennok
44dc5c58ce Relocate rotate() 
And add var/rotate for some dont rotated ship.
 2015-04-22 09:12:24 +03:00
Dennok
98e6decd23 Remove standatd_icon 2015-04-21 20:22:51 +03:00
PsiOmegaDelta
5da7c877d3 Merge pull request #8930 from Mark9013100/mercsuitfix 
Fixes the naming of the merc space suits
 2015-04-21 19:06:06 +02:00
Dennok
fdc3dac17e Forbid delit [ 2015-04-21 16:06:38 +03:00
Dennok
bdc9642cfd Rotete replace. 2015-04-21 15:57:55 +03:00
GinjaNinja32
a440b228c9 Diona 'split' command, plus bugfix 2015-04-21 01:55:43 +01:00
Mark9013100
f97d73f2a8 Fixes the naming of the merc space suits 2015-04-20 18:19:04 -04:00