Commit Graph

7112 Commits

Author SHA1 Message Date
igalan
10e76d9762 E-Wallet object added.
Made ATM to spawn e-wallets.

Untested.
2014-04-15 05:27:23 +01:00
Jarcolr
2ab200681b New IPC Faces - SparklySheep
http://baystation12.net/forums/viewtopic.php?f=44&t=9840
2014-04-14 11:30:29 +03:00
DJSnapshot
756d7a83e9 Merge pull request #4715 from Iamgoofball/FUCKMONKEY
Removes the last traces of Monkey Emergency
2014-04-11 11:47:37 -07:00
DJSnapshot
da3489196c Merge pull request #4727 from Ccomp5950/FUCK-say-code
Saycode rewrite.
2014-04-10 22:42:38 -07:00
Ccomp5950
6056b5dc3d Some fixes saycode cleanups
Moved the verb check from hear to the speaker

Spellcheck on hulk so Dragor doesn't beat me up.
2014-04-10 00:05:52 -05:00
Ccomp5950
46704a436b Saycode rewrite: Add support for speech_problem_flag
Ready for Dev
2014-04-08 21:50:01 -05:00
Ccomp5950
e1fef1796e Merge pull request #4707 from DJSnapshot/tasers
replaced electrodes with insta hit taser beams
2014-04-07 02:16:01 -05:00
Ccomp5950
80bae7a87d Merge pull request #4705 from DJSnapshot/jumpsuits
Undershirts and rolling down jumpsuits!
2014-04-07 02:12:59 -05:00
Ccomp5950
9fb43f2333 Merge pull request #4706 from DJSnapshot/papers
Carbonless copy papers
2014-04-07 02:12:10 -05:00
DJSnapshot
86d273e25e DEBUG TEXT, WOO 2014-04-06 18:31:33 -07:00
DJSnapshot
36b2efd3df disregard failure. I made a silly. 2014-04-06 18:29:50 -07:00
iamgoofball
238451dbc9 die monkey emergency DIE 2014-04-06 12:05:41 -07:00
Ccomp5950
9d291b79ea Merge pull request #4695 from mwerezak/dev
Made single cable pieces have w_class = 1
2014-04-06 00:16:06 -05:00
DJSnapshot
1a50dddbd4 replaced electrodes with insta hit taser beams. 2014-04-05 17:13:09 -07:00
DJSnapshot
61036e529e Merge pull request #4692 from Hubblenaut/master
Renamed paperwork no longer has 'paper -' in name
2014-04-05 17:03:48 -07:00
DJSnapshot
4ea07e2617 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers 2014-04-05 16:24:56 -07:00
DJSnapshot
7b7f3bcfc0 Undershirts and rolling down jumpsuits! 2014-04-05 16:18:11 -07:00
Mloc
cd23a4b786 Merge pull request #4690 from Glloyd/ear_stuff_2
A first pass at more realistic w_class values
2014-04-05 16:23:59 +01:00
Mike
fa1fd3cb24 Made single cable pieces have w_class = 1
Single cable pieces have w_class = 1 and can be tucked behind the ear.
2014-04-05 01:21:30 -04:00
Hubblenaut
0b29f83444 Renamed paperwork no longer has 'paper -' in name 2014-04-04 22:18:08 +02:00
Ccomp5950
6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	html/changelog.html
2014-04-04 01:14:31 -05:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Mike
353941db7c APCs that are undersupplied now call cell.give()
APCs that are undersupplied now call cell.give() instead of manipulating
cell.charge directly, for better encapsulation.
2014-04-02 23:46:54 -04:00
Chinsky
0bf6708342 Merge pull request #4666 from Ccomp5950/apc_fix
APC bugfix after someone messed with mah areas!
2014-04-01 18:17:22 +04:00
Chinsky
26007716e4 Merge pull request #4660 from Jarcolr/patch-2
Can no longer use fire extinguisher closet without hands
2014-04-01 16:23:18 +04:00
Ccomp5950
6af132b834 APC bugfix after someone messed with mah areas!
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.
2014-04-01 03:06:58 -05:00
Jarcolr
ffd4afa43d Also fixes paperbin without hands
Whee.
2014-03-31 18:48:57 +03:00
Chinsky
9227823e2c Merge pull request #4654 from Ccomp5950/Buff_NarSie
Lagsie no more, NarSie HUNGERS
2014-03-31 14:57:43 +04:00
DJSnapshot
19db97f9e2 Merge pull request #4650 from Ccomp5950/damn_boulders
Oversight, miners can now bump mine boulders just like the rock around them
2014-03-31 00:27:04 -07:00
DJSnapshot
0affa39490 initial CC paper commit. Will continue work on this. 2014-03-30 16:41:06 -07:00
Ccomp5950
bf7684bced Lagsie no more, NarSie HUNGERS
removed del() calls for objects, now it sets loc to null and removes it from master_controller processing

Much quicker :)
2014-03-30 03:15:20 -05:00
Ccomp5950
9915d28fb1 Removal of last debug message and making players be able to use languages over general comms
;:k = skrell speak over general comms for example.
2014-03-30 01:10:02 -05:00
Graham Lloyd
f176b2dea9 I can feel the hugs already. 2014-03-30 00:49:23 -04:00
Ccomp5950
e23530e31c Say code rewrite, Silicon jerks now using new saycode.
Tracking added for AI's and Observers

Instead of calling GetVoice() over and over for everyone that can hear you we're checking a variable that is updated with Life()

removed a bunch of my debug verbs.
2014-03-29 23:28:47 -05:00
Ccomp5950
12b5db483e Oversight, miners can now bump mine boulders just like the rock around them.
Screw you xenoarch code, screw you.
2014-03-29 16:07:47 -05:00
Ccomp5950
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
2014-03-28 18:46:04 -05:00
Chinsky
60b6daadee Merge pull request #4641 from Ccomp5950/log_fix
*NIX Log files part 2.
2014-03-27 15:12:19 +03:00
Chinsky
896ef5970b Merge pull request #4633 from MrLeebo/virology-fixes
Virology - NanoUI, gameplay tweaks, bugfixes
2014-03-27 15:10:35 +03:00
Ccomp5950
936db263ef *NIX Log files part 2.
CR+LF added to new lines, created a global variable log_end that can be used
on newlines

log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

put [log_end] prior to any \n and it will show up correctly in windows.

Also created log_misc() proc to log to diary, and removed a bunch of

diary << stuff all over the place.
2014-03-26 18:51:37 -05:00
Ccomp5950
bee3d30baa Oops, broke Mesons when I fixed NVG's
This should put things back where they go.
2014-03-26 17:19:51 -05:00
Jeremy Liberman
bf6c3d3a24 Code review and remove baystation12.int from source control. 2014-03-25 22:17:02 -05:00
Chinsky
d6bb03943b Merge pull request #4626 from Iamgoofball/chambox
Expanded on an old TG PR, Adds 9 new Chameleon items.
2014-03-26 02:12:59 +03:00
iamgoofball
98264dc27e stop being a chemical container plzty 2014-03-25 16:11:40 -07:00
Chinsky
820b5e0d9b Merge pull request #4632 from Ccomp5950/apc_low_charge_fix
Bugfix for new APC code, gridchecks won't just turn off equipment.
2014-03-25 23:12:21 +03:00
Mloc
38a22e880f Merge pull request #4623 from Ccomp5950/bugfixes
Bugfixes, Various
2014-03-25 08:45:53 +00:00
Jeremy Liberman
16f787a1da Virology - NanoUI, gameplay tweaks, bugfixes 2014-03-24 23:55:41 -05:00
Ccomp5950
d6a9448535 Bugfix for new APC code, gridchecks won't just turn off equipment.
Was a problem with me switching the order of the checks.
2014-03-24 17:42:27 -05:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master"
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
2014-03-24 13:55:41 +00:00
Mloc-Hibernia
dc97a2502a Revert "Merge pull request #4607 from Aryn/master"
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
2014-03-24 13:54:11 +00:00