Commit Graph

11606 Commits

Author SHA1 Message Date
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
4d9586ecae Fixes balaclava sprite sheets 2015-04-25 02:55:04 -04: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
Daranz
12a6797723 Add renaming of things (papers, etc.) in folders 2015-04-23 21:49:56 -04:00
Daranz
1bd25c54e3 Add random access inserting into paper bundles
You can now insert papers into paper bundles by clicking on the next page or
previous page link with a sheet of paper in hand.

The bundle window also now correctly updates when the bundle is in a folder.
2015-04-23 21:49:56 -04:00
mwerezak
0a7fd34f3f Limb augments no longer prevent putting on jumpsuits 2015-04-23 11:27:16 -04:00
Daranz
ad51379d86 Make papers in a clipboard renameable without removing 2015-04-23 08:48:52 -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
a2cf2a4d1a Adjusts custom item loadout costs to be more balanced and standardises costs, standard cosmetics are 1 point, items with uses/armor/storage are 2 points. 2015-04-22 16:19:59 +01: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
Zuhayr
fc9c00bb5b Merge pull request #8867 from Jarcolr/patch-1
Fixes #8810
2015-04-20 18:04:04 +09:30
PsiOmega
7f6b908af2 Fixes #8917.
Makes it possible to scan for new sensors as necessary.
Useful if the ability to remove/change/create new sensors is added.
2015-04-20 10:03:54 +02:00
PsiOmega
799a5b79db Ensures new players cannot ghost by moving, really breaks things. 2015-04-20 08:37:57 +02:00
Hubblenaut
8528948bcd Adds blinding/muzzling and changes trigger for jointbreaking 2015-04-19 20:17:28 +02:00
Hubblenaut
a40ef85a5f Merge branch 'grab' into dev
Conflicts:
	icons/mob/screen1.dmi
2015-04-19 16:00:28 +02:00
Chinsky
940b5c8c62 Merge pull request #8891 from volas/sanitize3
sanitize() 3
2015-04-19 14:59:36 +03:00
volas
7dedbc6d78 Alternative copytext, safe for html entities 2015-04-19 12:37:04 +03:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master
Master into dev
2015-04-19 17:26:04 +09:30
PsiOmega
27abc7404d Gives AI a personal atmospherics control subsystem.
Includes further work on NanoUI interactions.
2015-04-19 00:24:19 +02:00
Zuhayr
05d05732f8 Merge pull request #8888 from PsiOmegaDelta/ThemLogs
Ports the changelog system used by /vg/, /tg/, and others.
2015-04-19 03:17:49 +09:30