Commit Graph

8013 Commits

Author SHA1 Message Date
Jim "Apples"
70a82fcde6 Merge pull request #2080 from Zuhayr/master
Oen'g's baton (Custom item)
2012-12-18 05:14:23 -08:00
Zuhayr
d59b160f80 Oen'g's baton. 2012-12-19 00:13:19 -08:00
cib
455b0a7c3b Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/game/gamemodes/events.dm
2012-12-18 14:08:41 +01:00
cib
ebb8a73ee3 Derp in previous commit.
Whoops. :(
2012-12-16 16:37:38 +01:00
cib
8355d498c7 Adjusted event chance config to new event system.
With events adjusted to departments, events should happen a bit more often.
2012-12-16 16:19:55 +01:00
cib
847c1efd0f Fixed a problem with events probability.
I multiplied with "percent" chances, without dividing by 100. Would lead to permanently 100% chance of anything.
2012-12-16 16:16:21 +01:00
cib
d94faea360 Event system now takes department activity into account.
Pretty much an overhaul of the whole event choosing system, which makes it a bit better IMO. Ported this from my larger feature request branch.
2012-12-16 15:15:18 +01:00
cib
d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
2012-12-16 15:10:04 +01:00
cib
933e53aa98 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into minor_feature
Conflicts:
	code/game/gamemodes/events.dm
2012-12-16 15:02:54 +01:00
cib
679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
Hawk-v3
9ed0e80acf Merge pull request #2058 from GauHelldragon/master
Portable Generator Fix
2012-12-16 05:55:56 -08:00
Zuhayr
45527ec599 Four custom items plus config.txt. 2012-12-16 00:40:04 -08:00
cib
7cf3244316 Fixes issue #2059
Mob transform into monkey no longer uses hardcoded DNA size of 14.
2012-12-16 04:57:32 +01:00
cib
a6d5a6a26e Removed yet another type of gib that looks like a head.
Just how many heads does a person have, according to this code?
2012-12-16 04:40:19 +01:00
cib
cc2057240a Fixed two compile errors. 2012-12-16 04:23:57 +01:00
cib
49958de6aa Removed loyalty implants from all security except the HoS.
See http://baystation12.net/forums/viewtopic.php?f=5&t=6318
2012-12-16 04:11:55 +01:00
cib
0855c5d1af Fixes issue #2006
Medical belt can now hold autoinjector.
2012-12-16 04:04:43 +01:00
cib
16a31a0cc3 Fixes issue #2053
Shuttle doors now close just before the shuttle leaves.
2012-12-16 03:59:32 +01:00
cib
caf56c4c7d Merge branch 'bugfix' into minor_feature 2012-12-16 03:41:32 +01:00
cib
a6d1a666a9 Merge branch 'bugfix' into feature
Conflicts:
	code/game/gamemodes/events.dm
2012-12-16 03:41:11 +01:00
cib
7b8a33dc53 Fixed compile error regarding unclosed comment in events.dm 2012-12-16 03:39:45 +01:00
cib
9c4a48ffe5 Gibbing now creates actual limbs instead of decals.
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
2012-12-16 03:25:26 +01:00
cib
62d88717ba Fixed a bug with rev objective checking.
If a single alive, non-converted head left the station z-level, it'd be a victory for the revs.
2012-12-16 00:18:50 +01:00
Jim "Apples"
cff920917b Merge pull request #2054 from caelaislinn/work_in_progress
Various
2012-12-15 04:08:07 -08:00
Zuhayr
aedf5f2068 Ty Foster's custom necklace, Butcher Royce's custom Ripley skin and some minor changes to support it. 2012-12-15 02:08:03 -08:00
Cael_Aislinn
67b0e79b29 removed vermin spawn turf selection (was causing a short freeze at roundstart)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-15 12:40:23 +10:00
Cael_Aislinn
50c4c120ba space ninja candidates have a timed popup asking the player if they accept (using ShadowDarke's sd_Alert), minor formatting cleanups
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-15 12:39:22 +10:00
Cael_Aislinn
b7804cc295 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/bleeding-edge-freeze' into work_in_progress 2012-12-15 00:39:16 +10:00
Cael_Aislinn
d1cf168480 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-15 00:39:07 +10:00
Cael_Aislinn
df37dd4e75 significantlyt sped up temperature and pressure equalization when merging zones or hull breaches
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-15 00:36:39 +10:00
Zuhayr
6c3aec4198 Nasir's custom medallion. 2012-12-14 00:14:24 -08:00
Zuhayr
f8af31bdda Three custom items: Ana Ka'Rimah, Jane Doe, Altair An-Nasaqan. 2012-12-13 02:40:45 -08:00
GauHelldragon
0db60b65c7 Portable generator Fix
Portable generators properly drop their fuel when deconstructed
Portable generators need their cover open to be destructed now
Fixed a runtime error when building a portable generator with a 2s wire
2012-12-12 02:49:29 -08:00
cib
b9427171b5 Compile fix. 2012-12-11 21:32:41 +01:00
cib
3bd4714b1c Made event likelihood depend on number of players. 2012-12-11 21:29:33 +01:00
cib
ce59e15daf Moved the wind sound effect code to zones instead of airflow.
This'll make it possible to hear sounds even when the flow isn't strong enough to actually move objects.
2012-12-11 21:29:02 +01:00
cib
9d113c51ba Fixed a problem with air exchange rates.
There was a lookup table overwriting the changed values. Silly me.
2012-12-11 20:53:13 +01:00
cib
91c3596a7f Remove the space cold exchange once again.
Must've undone that change by mistake.
2012-12-11 20:20:12 +01:00
cib
8cd38b8a20 Merge branch 'feature' of github.com:CIB/Baystation12 into feature 2012-12-11 20:09:10 +01:00
cib
f36dd9d261 Adjusted pressure exchange rates in consideration of space not compressing air anymore. 2012-12-11 19:51:24 +01:00
cib
f633e61f9e Added a harm objective.
Objective is to break a bone, delimb, or disfigure their face.
2012-12-11 16:40:01 +01:00
cib
e218061c5e Added brig objective to traitors. 2012-12-11 15:57:58 +01:00
cib
cbf708d237 Increased volume for wind sound effect. 2012-12-11 15:26:12 +01:00
cib
8b90cd6fa8 Experimental: Disable temperature exchange with space and add low
pressure damage.

This'll stop the ridiculous cold temperatures from opening an airlock
for half a second.
2012-12-11 14:57:28 +01:00
cib
96fb7cf14b Rebalanced spaceacillin metabolism.
It used to be something like 1 unit per tick, which only lasted around 2
minutes for 15 units. Now it'll last a bit longer, making it actually
useful.
2012-12-11 13:22:44 +01:00
cib
086bd846a0 Converted the virus event to new virus code. 2012-12-11 13:14:32 +01:00
cib
df1117b5d2 Another compile fix. 2012-12-11 13:05:22 +01:00
cib
850c6f26b8 Compile fix. 2012-12-11 13:03:17 +01:00
cib
3d5b7885d6 Implements event probability based on current active crew.
- Proc to count how many active players with a given role(also counts
cyborgs with department module)
- Rewrote event main proc to select event based on whether and how many
active players who can fix it. This will also lead to more events
happening with many people in a department.
2012-12-11 12:59:55 +01:00
cib
e055330465 Merge branch 'feature' of github.com:CIB/Baystation12 into feature 2012-12-11 12:10:39 +01:00