Commit Graph

867 Commits

Author SHA1 Message Date
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
GinjaNinja32
37d3418688 Fix runtime due to processing hydrotray at loc=null 2014-09-22 18:42:02 +01:00
Zuhayr
afde93e94d Adds random seeds to Cargo for Xenobotany. 2014-09-18 16:39:44 +09:30
Atlantiscze
c5e5856e82 Merge branch 'dev' into substation-multifix 2014-09-12 20:11:42 +02:00
mwerezak
d12a09addb Powernets
Moved powernet datum definition to powernet.dm
Improved APC load balancing.
Updated SMES charging to work better with new APC/powernet code.
2014-09-07 01:10:22 -04:00
PsiOmega
4b4c2d11fa Beepsky and ED209 are now closer friends than ever, now actually sharing code instead of each having gone and bought their own.
There is potential for breaking out all the special stuff for laser code but for now I'm happy to simply have a shared codebase.
I imagine pathfinding/patrolling may be sharable with bots in general as well.
2014-09-04 12:38:51 +02:00
Atlantiscze
68dc63e005 SMES Coil Cost
- Supply point cost doubled to 150 according to feedback.
2014-09-02 15:15:47 +02:00
PsiOmega
b7d356c4ab The Syndicate uplink now only access the locked records, meaning it will be unaware of later in-round changes concerning a given character. 2014-09-02 07:12:13 +02:00
PsiOmega
9e4b7ed265 Preliminary support for the new general information. Renames the exploit record to permanent record.
The new general information being:
Home system
Citizenship
Faction
Religion

Still to be made available in employment/security/medical records as applicable.
2014-09-01 14:45:47 +02:00
PsiOmega
89b29eb0f0 One can now save exploitable information about the character, potentially to be used by antags. 2014-08-31 21:31:10 +02:00
Atlantiscze
641098fe78 SMES (de)construction:
- Adds supply pack for SMES coil. Costs 75 points for single coil.
- Adds design for SMES circuitboard. Needs diamonds, gold, silver and is very high tech.
2014-08-30 22:03:37 +02:00
PsiOmega
ad387fda96 One can now update crew record photos using a security console. 2014-08-22 19:39:35 +02:00
Chinsky
ed491e58f7 Merge pull request #5957 from mwerezak/train-cost
Adjusts train supply costs to make the tug/cart ratio choice more interesting for players.
2014-08-13 18:34:51 +04:00
mwerezak
db1e88abed Adjusts train supply costs 2014-08-11 12:25:07 -04:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Whitellama
49c8c6f2cb Made arcane tomes a subtype of books, fixes #5838 2014-08-10 02:23:36 -07:00
Zuhayr
f2393d9465 Replaces antag intro text and objective announcement with a proc. 2014-07-30 21:36:31 +09:30
Chinsky
fcdca5ca5b Merge pull request #5832 from Baystation12/master
master - > dev
2014-07-29 18:37:19 +04:00
Chinsky
4d8db295d8 Merge pull request #5814 from JimTheCactus/polaroid
Improves Polaroid Camera Images
2014-07-29 17:57:41 +04:00
Zuhayr
7b084ed349 Fixed diona pods being mutable, fixed a few other tweaks, added cuttings. 2014-07-29 12:38:21 +09:30
JimTheCactus
646aad945e Merged getFlatIcon rendering from tgstation
Based on tgstation #2826. This is not all of it though.
2014-07-27 17:21:19 -06:00
Zuhayr
dc10f92ad1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:23:35 +09:30
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Jarcolr
8296f29c76 Fixes #5506 and split of groups
Engineering split into new group "Atmospherics".
Medical / Science nwo "Medical" and "Science".
2014-07-26 12:32:19 +03:00
Zuhayr
d8336061b4 Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev 2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
Loganbacca
1b1e4bc118 Cargo train update
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates
2014-07-24 18:01:10 +12:00
Decius
0b314561ca Now allows admin override via player panel, a small fix, and...
implantation works again. Since they'll only be accessible via an admin
specifically spawning it, except for in cases where it is configured
to be allowed, it'll be fine.

This now allows admins to incorporate loyalty implants still if they so
wish for whatever reason, but it is normally inaccessible.

Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 19:02:21 -04:00
Decius
203c36114d Made spawning with a loyalty implant compliant to configuration...
Created a proc for being implanted with loyalty implant which
checks for the configuration for whether or not it will work. If it is
enabled, it continues on-- if it is disabled, it returns from the proc.

Also made secure closets not automatically spawn them unless the config
is set to allow it.

Admin 'loyalty implanting' via the panel is now compliant to the
configuration file. If preferred, I am willing to make an override variable
to the proc that will allow admins to do it anyway.

Supply pack for it commented out due to inability to make it conform.
Easy enough to re-add back for anyone downstream if they wish it. Same
applies to the design.


Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 17:21:11 -04:00
Decius
021c48ea02 Added in damage towards people being converted by cult, and fixed a typo...
People who are being converted by the cult now take 10 damage in the first
place. Additionally, those who resist take a little bit more damage and get
a fair number of messages showing their great painful resisting and whatnot.

Light and fun.

Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-07 22:23:20 -04:00
Zuhayr
b670cdcdf1 Fixes #5483 2014-07-04 17:48:12 +09:30
Hubblenaut
abef4bf943 Fixes teleporting while buckled 2014-07-02 22:35:11 +02:00
DJSnapshot
488c4f4b84 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop
Conflicts:
	code/setup.dm
2014-06-23 00:25:39 -07:00
DJSnapshot
7a5a3d47ae Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do. 2014-06-22 03:31:06 -07:00
DJSnapshot
9de9dab362 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 2014-06-22 02:08:42 -07:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
mwerezak
83abddd8a8 Fixes tails not rendering in record photos 2014-06-18 00:26:02 -04:00
Boop
d2e81da90c Fixes #4756
removes the getrev stuff because it's svn and old and I couldn't get tg's stuff to work :c
2014-06-17 17:25:57 +01:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
sick-trigger
ba83728e47 Scientist records photo fix
Fixes #5156
2014-06-09 17:45:16 +10:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Zuhayr
69c882bfec Fixes #4973 2014-06-01 20:46:58 +09:30
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev"
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
Zuhayr
3b3bd5649d Merge pull request #5024 from Jarcolr/Cargo
Adds 21 new crates and a tweak
2014-05-28 01:21:24 +09:30
Jarcolr
049b9cc447 Fixes and a suggested change
Fixed N2O typo, Super Pacman, anchor issues, inflatable barrier issues
that was already on master so this doesn't conflict, and added a new box
for shotgun shells and adjusted price of crates accordingly
2014-05-27 17:15:17 +03:00
Ccomp5950
d411a6c48e Merge pull request #5060 from RavingManiac/master
Fixed inflatable barrier crates
2014-05-27 04:04:13 -05:00